LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwc: Populate frame rate in rotator set

Browse Source 
- Populate frame_rate in rotator set, so that driver
  can vote for honest BW for rotator based on frame rate.
- If metadata contains source fps, frame_rate will be set
  to source fps, else it will be set to primary refresh rate.
- frame_rate will be populated for primary with
  source fps from metada, only when secondary is not active.

Change-Id: Icaacd0ed67ec09591d31868591680d2e86fe54a2
This commit is contained in:
radhakrishna
2015-06-04 16:09:16 +05:30
parent 4f9cb42a7a
commit b8e2c95763
7 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libhwcomposer/hwc_fbupdate.cpp
View File

@@ -101,7 +101,8 @@ bool FBUpdateNonSplit::preRotateExtDisplay(hwc_context_t *ctx,
// viewFrame with sourceCrop to avoid those black bars
sourceCrop = getIntersection(sourceCrop, ctx->mViewFrame[mDpy]);
//Configure rotator for pre-rotation
if(configRotator(mRot, info, sourceCrop, mdpFlags, orient, 0) < 0) {
if(configRotator(mRot, info, sourceCrop, mdpFlags, orient, 0,
ctx->dpyAttr[HWC_DISPLAY_PRIMARY].refreshRate) < 0) {
ALOGE("%s: configRotator Failed!", __FUNCTION__);
mRot = NULL;
return false;

8
libhwcomposer/hwc_mdpcomp.cpp
View File

@@ -3103,8 +3103,14 @@ int MDPCompSrcSplit::configure(hwc_context_t *ctx, hwc_layer_1_t *layer,
BwcPM::setBwc(ctx, mDpy, hnd, crop, dst, transform, downscale,
mdpFlags);
}
uint32_t frame_rate = ctx->dpyAttr[HWC_DISPLAY_PRIMARY].refreshRate;
if(!mDpy && !isSecondaryConnected(ctx)) {
if(metadata && (metadata->operation & UPDATE_REFRESH_RATE))
frame_rate = metadata->refreshrate;
}
//Configure rotator for pre-rotation
if(configRotator(*rot, whf, crop, mdpFlags, orient, downscale) < 0) {
if(configRotator(*rot, whf, crop, mdpFlags, orient, downscale,
frame_rate) < 0) {
ALOGE("%s: configRotator failed!", __FUNCTION__);
return -1;
}

36
libhwcomposer/hwc_utils.cpp
View File

@@ -1922,7 +1922,8 @@ void setMdpFlags(hwc_context_t *ctx, hwc_layer_1_t *layer,
int configRotator(Rotator *rot, Whf& whf,
hwc_rect_t& crop, const eMdpFlags& mdpFlags,
const eTransform& orient, const int& downscale) {
const eTransform& orient, const int& downscale,
const uint32_t& frame_rate) {
// Fix alignments for TILED format
if(whf.format == MDP_Y_CRCB_H2V2_TILE ||
@@ -1939,6 +1940,7 @@ int configRotator(Rotator *rot, Whf& whf,
rot->setCrop(rotCrop);
}
rot->setFrameRate(frame_rate);
rot->setFlags(mdpFlags);
rot->setTransform(orient);
rot->setDownscale(downscale);
@@ -2226,8 +2228,14 @@ int configureNonSplit(hwc_context_t *ctx, hwc_layer_1_t *layer,
ctx->mLayerRotMap[dpy]->add(layer, *rot);
BwcPM::setBwc(ctx, dpy, hnd, crop, dst, transform, downscale,
mdpFlags);
uint32_t frame_rate = ctx->dpyAttr[HWC_DISPLAY_PRIMARY].refreshRate;
if(!dpy && !isSecondaryConnected(ctx)) {
if(metadata && (metadata->operation & UPDATE_REFRESH_RATE))
frame_rate = metadata->refreshrate;
}
//Configure rotator for pre-rotation
if(configRotator(*rot, whf, crop, mdpFlags, orient, downscale) < 0) {
if(configRotator(*rot, whf, crop, mdpFlags, orient, downscale,
frame_rate) < 0) {
ALOGE("%s: configRotator failed!", __FUNCTION__);
return -1;
}
@@ -2335,8 +2343,14 @@ int configureSplit(hwc_context_t *ctx, hwc_layer_1_t *layer,
(*rot) = ctx->mRotMgr->getNext();
if((*rot) == NULL) return -1;
ctx->mLayerRotMap[dpy]->add(layer, *rot);
uint32_t frame_rate = ctx->dpyAttr[HWC_DISPLAY_PRIMARY].refreshRate;
if(!dpy && !isSecondaryConnected(ctx)) {
if(metadata && (metadata->operation & UPDATE_REFRESH_RATE))
frame_rate = metadata->refreshrate;
}
//Configure rotator for pre-rotation
if(configRotator(*rot, whf, crop, mdpFlagsL, orient, downscale) < 0) {
if(configRotator(*rot, whf, crop, mdpFlagsL, orient, downscale,
frame_rate) < 0) {
ALOGE("%s: configRotator failed!", __FUNCTION__);
return -1;
}
@@ -2459,8 +2473,14 @@ int configure3DVideo(hwc_context_t *ctx, hwc_layer_1_t *layer,
(*rot) = ctx->mRotMgr->getNext();
if((*rot) == NULL) return -1;
ctx->mLayerRotMap[dpy]->add(layer, *rot);
uint32_t frame_rate = ctx->dpyAttr[HWC_DISPLAY_PRIMARY].refreshRate;
if(!dpy && !isSecondaryConnected(ctx)) {
if(metadata && (metadata->operation & UPDATE_REFRESH_RATE))
frame_rate = metadata->refreshrate;
}
//Configure rotator for pre-rotation
if(configRotator(*rot, whf, crop, mdpFlagsL, orient, downscale) < 0) {
if(configRotator(*rot, whf, crop, mdpFlagsL, orient, downscale,
frame_rate) < 0) {
ALOGE("%s: configRotator failed!", __FUNCTION__);
return -1;
}
@@ -2577,8 +2597,14 @@ int configureSourceSplit(hwc_context_t *ctx, hwc_layer_1_t *layer,
(*rot) = ctx->mRotMgr->getNext();
if((*rot) == NULL) return -1;
ctx->mLayerRotMap[dpy]->add(layer, *rot);
uint32_t frame_rate = ctx->dpyAttr[HWC_DISPLAY_PRIMARY].refreshRate;
if(!dpy && !isSecondaryConnected(ctx)) {
if(metadata && (metadata->operation & UPDATE_REFRESH_RATE))
frame_rate = metadata->refreshrate;
}
//Configure rotator for pre-rotation
if(configRotator(*rot, whf, crop, mdpFlagsL, orient, downscale) < 0) {
if(configRotator(*rot, whf, crop, mdpFlagsL, orient, downscale,
frame_rate) < 0) {
ALOGE("%s: configRotator failed!", __FUNCTION__);
return -1;
}

3
libhwcomposer/hwc_utils.h
View File

@@ -420,7 +420,8 @@ void setMdpFlags(hwc_context_t *ctx, hwc_layer_1_t *layer,
int configRotator(overlay::Rotator *rot, ovutils::Whf& whf,
hwc_rect_t& crop, const ovutils::eMdpFlags& mdpFlags,
const ovutils::eTransform& orient, const int& downscale);
const ovutils::eTransform& orient, const int& downscale,
const uint32_t& frame_rate);
int configMdp(overlay::Overlay *ov, const ovutils::PipeArgs& parg,
const ovutils::eTransform& orient, const hwc_rect_t& crop,

4
liboverlay/overlayMdpRot.cpp
View File

@@ -126,6 +126,10 @@ void MdpRot::setCrop(const utils::Dim& /*crop*/) {
// NO-OP for non-mdss rotator due to possible h/w limitations
}
void MdpRot::setFrameRate(uint32_t /*frame_rate*/) {
// NO-OP for non-mdss rotator
}
void MdpRot::setFlags(const utils::eMdpFlags& flags) {
mRotImgInfo.secure = 0;
if(flags & utils::OV_MDP_SECURE_OVERLAY_SESSION)

4
liboverlay/overlayMdssRot.cpp
View File

@@ -129,6 +129,10 @@ void MdssRot::setDownscale(int downscale) {
mDownscale = downscale;
}
void MdssRot::setFrameRate(uint32_t frame_rate) {
mRotInfo.frame_rate = frame_rate;
}
void MdssRot::setFlags(const utils::eMdpFlags& flags) {
mRotInfo.flags = flags;
}

3
liboverlay/overlayRotator.h
View File

@@ -97,6 +97,7 @@ public:
virtual bool queueBuffer(int fd, uint32_t offset) = 0;
virtual void dump() const = 0;
virtual void getDump(char *buf, size_t len) const = 0;
virtual void setFrameRate(uint32_t frame_rate) = 0;
inline void setCurrBufReleaseFd(const int& fence) {
mMem.setCurrBufReleaseFd(fence);
}
@@ -150,6 +151,7 @@ public:
virtual bool queueBuffer(int fd, uint32_t offset);
virtual void dump() const;
virtual void getDump(char *buf, size_t len) const;
virtual void setFrameRate(uint32_t frame_rate);
private:
explicit MdpRot();
@@ -222,6 +224,7 @@ public:
virtual bool queueBuffer(int fd, uint32_t offset);
virtual void dump() const;
virtual void getDump(char *buf, size_t len) const;
virtual void setFrameRate(uint32_t frame_rate);
private:
explicit MdssRot();