Merge "hqd: Fix validate and prepare frame for virtual displays"
diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 5c9f2d1..db456bc 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -105,7 +105,10 @@
//Helper
static void reset(hwc_context_t *ctx, int numDisplays,
hwc_display_contents_1_t** displays) {
+
ctx->numActiveDisplays = 0;
+ ctx->isPaddingRound = false;
+
for(int i = 0; i < numDisplays; i++) {
hwc_display_contents_1_t *list = displays[i];
// XXX:SurfaceFlinger no longer guarantees that this
@@ -125,6 +128,17 @@
* the display device to be active.
*/
ctx->numActiveDisplays += 1;
+
+ if((ctx->mPrevHwLayerCount[i] == 1) and (list->numHwLayers > 1)) {
+ /* If the previous cycle for dpy 'i' has 0 AppLayers and the
+ * current cycle has atleast 1 AppLayer, padding round needs
+ * to be invoked on current cycle to free up the resources.
+ */
+ ctx->isPaddingRound = true;
+ }
+ ctx->mPrevHwLayerCount[i] = list->numHwLayers;
+ } else {
+ ctx->mPrevHwLayerCount[i] = 0;
}
if(ctx->mFBUpdate[i])
@@ -133,7 +147,6 @@
ctx->mCopyBit[i]->reset();
if(ctx->mLayerRotMap[i])
ctx->mLayerRotMap[i]->reset();
-
}
ctx->mAD->reset();
@@ -471,6 +484,9 @@
case HWC_COLOR_FILL:
value[0] = 1;
break;
+ case HWC_MAX_WRITEBACK_WIDTH:
+ value[0] = qdutils::MAX_DISPLAY_DIM;
+ break;
default:
return -EINVAL;
}
diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index 40b00dd..6ff1aa3 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -419,8 +419,8 @@
__FUNCTION__);
ret = false;
} else if(ctx->isPaddingRound) {
- ctx->isPaddingRound = false;
- ALOGD_IF(isDebug(), "%s: padding round",__FUNCTION__);
+ ALOGD_IF(isDebug(), "%s: padding round invoked for dpy %d",
+ __FUNCTION__,mDpy);
ret = false;
}
return ret;
@@ -1296,10 +1296,6 @@
return false;
}
- if(!arePipesAvailable(ctx, list)) {
- return false;
- }
-
double size = calcMDPBytesRead(ctx, list);
if(!bandwidthCheck(ctx, size)) {
ALOGD_IF(isDebug(), "%s: Exceeds bandwidth",__FUNCTION__);
@@ -1409,11 +1405,10 @@
const int numLayers = ctx->listStats[mDpy].numAppLayers;
MDPVersion& mdpVersion = qdutils::MDPVersion::getInstance();
- //number of app layers exceeds MAX_NUM_APP_LAYERS fall back to GPU
- //do not cache the information for next draw cycle.
- if(numLayers > MAX_NUM_APP_LAYERS) {
- ALOGI("%s: Number of App layers exceeded the limit ",
- __FUNCTION__);
+ //Do not cache the information for next draw cycle.
+ if(numLayers > MAX_NUM_APP_LAYERS or (!numLayers)) {
+ ALOGI("%s: Unsupported layer count for mdp composition",
+ __FUNCTION__);
mCachedFrame.reset();
return -1;
}
@@ -1550,58 +1545,6 @@
&PipeLayerPair.rot);
}
-bool MDPCompNonSplit::arePipesAvailable(hwc_context_t *ctx,
- hwc_display_contents_1_t* list) {
- overlay::Overlay& ov = *ctx->mOverlay;
- int numPipesNeeded = mCurrentFrame.mdpCount;
- int availPipes = ov.availablePipes(mDpy, Overlay::MIXER_DEFAULT);
-
- //Reserve pipe for FB
- if(mCurrentFrame.fbCount)
- availPipes -= 1;
-
- if(numPipesNeeded > availPipes) {
- ALOGD_IF(isDebug(), "%s: Insufficient pipes, dpy %d needed %d, avail %d",
- __FUNCTION__, mDpy, numPipesNeeded, availPipes);
- return false;
- }
-
- if(not areVGPipesAvailable(ctx, list)) {
- return false;
- }
-
- return true;
-}
-
-bool MDPCompNonSplit::areVGPipesAvailable(hwc_context_t *ctx,
- hwc_display_contents_1_t* list) {
- overlay::Overlay& ov = *ctx->mOverlay;
- int pipesNeeded = 0;
- for(int i = 0; i < mCurrentFrame.layerCount; ++i) {
- if(!mCurrentFrame.isFBComposed[i]) {
- hwc_layer_1_t* layer = &list->hwLayers[i];
- hwc_rect_t dst = layer->displayFrame;
- private_handle_t *hnd = (private_handle_t *)layer->handle;
- if(is4kx2kYuvBuffer(hnd) && sEnable4k2kYUVSplit){
- pipesNeeded = pipesNeeded + 2;
- }
- else if(isYuvBuffer(hnd)) {
- pipesNeeded++;
- }
- }
- }
-
- int availableVGPipes = ov.availablePipes(mDpy, ovutils::OV_MDP_PIPE_VG);
- if(pipesNeeded > availableVGPipes) {
- ALOGD_IF(isDebug(), "%s: Insufficient VG pipes for video layers"
- "dpy %d needed %d, avail %d",
- __FUNCTION__, mDpy, pipesNeeded, availableVGPipes);
- return false;
- }
-
- return true;
-}
-
bool MDPCompNonSplit::allocLayerPipes(hwc_context_t *ctx,
hwc_display_contents_1_t* list) {
for(int index = 0; index < mCurrentFrame.layerCount; index++) {
@@ -1799,105 +1742,6 @@
}
}
-int MDPCompSplit::pipesNeeded(hwc_context_t *ctx,
- hwc_display_contents_1_t* list,
- int mixer) {
- int pipesNeeded = 0;
-
- const int lSplit = getLeftSplit(ctx, mDpy);
-
- for(int i = 0; i < mCurrentFrame.layerCount; ++i) {
- if(!mCurrentFrame.isFBComposed[i]) {
- hwc_layer_1_t* layer = &list->hwLayers[i];
- hwc_rect_t dst = layer->displayFrame;
- if(mixer == Overlay::MIXER_LEFT && dst.left < lSplit) {
- pipesNeeded++;
- } else if(mixer == Overlay::MIXER_RIGHT && dst.right > lSplit) {
- pipesNeeded++;
- }
- }
- }
- return pipesNeeded;
-}
-
-bool MDPCompSplit::arePipesAvailable(hwc_context_t *ctx,
- hwc_display_contents_1_t* list) {
- overlay::Overlay& ov = *ctx->mOverlay;
- int totalPipesNeeded = 0;
-
- for(int i = 0; i < Overlay::MIXER_MAX; i++) {
- int numPipesNeeded = pipesNeeded(ctx, list, i);
- int availPipes = ov.availablePipes(mDpy, i);
-
- //Reserve pipe(s)for FB
- if(mCurrentFrame.fbCount)
- numPipesNeeded += 1;
-
- totalPipesNeeded += numPipesNeeded;
-
- //Per mixer check.
- if(numPipesNeeded > availPipes) {
- ALOGD_IF(isDebug(), "%s: Insufficient pipes for "
- "dpy %d mixer %d needed %d, avail %d",
- __FUNCTION__, mDpy, i, numPipesNeeded, availPipes);
- return false;
- }
- }
-
- //Per display check, since unused pipes can get counted twice.
- int totalPipesAvailable = ov.availablePipes(mDpy);
- if(totalPipesNeeded > totalPipesAvailable) {
- ALOGD_IF(isDebug(), "%s: Insufficient pipes for "
- "dpy %d needed %d, avail %d",
- __FUNCTION__, mDpy, totalPipesNeeded, totalPipesAvailable);
- return false;
- }
-
- if(not areVGPipesAvailable(ctx, list)) {
- return false;
- }
-
- return true;
-}
-
-bool MDPCompSplit::areVGPipesAvailable(hwc_context_t *ctx,
- hwc_display_contents_1_t* list) {
- overlay::Overlay& ov = *ctx->mOverlay;
- int pipesNeeded = 0;
- const int lSplit = getLeftSplit(ctx, mDpy);
- for(int i = 0; i < mCurrentFrame.layerCount; ++i) {
- if(!mCurrentFrame.isFBComposed[i]) {
- hwc_layer_1_t* layer = &list->hwLayers[i];
- hwc_rect_t dst = layer->displayFrame;
- private_handle_t *hnd = (private_handle_t *)layer->handle;
- if(is4kx2kYuvBuffer(hnd) && sEnable4k2kYUVSplit){
- if((dst.left > lSplit)||(dst.right < lSplit)){
- pipesNeeded = pipesNeeded + 2;
- continue;
- }
- }
- if(isYuvBuffer(hnd)) {
- if(dst.left < lSplit) {
- pipesNeeded++;
- }
- if(dst.right > lSplit) {
- pipesNeeded++;
- }
- }
- }
- }
-
- int availableVGPipes = ov.availablePipes(mDpy, ovutils::OV_MDP_PIPE_VG);
- if(pipesNeeded > availableVGPipes) {
- ALOGD_IF(isDebug(), "%s: Insufficient VG pipes for video layers"
- "dpy %d needed %d, avail %d",
- __FUNCTION__, mDpy, pipesNeeded, availableVGPipes);
- return false;
- }
-
- return true;
-}
-
bool MDPCompSplit::acquireMDPPipes(hwc_context_t *ctx, hwc_layer_1_t* layer,
MdpPipeInfoSplit& pipe_info,
ePipeType type) {
diff --git a/libhwcomposer/hwc_mdpcomp.h b/libhwcomposer/hwc_mdpcomp.h
index 40a0cb5..f2a8eda 100644
--- a/libhwcomposer/hwc_mdpcomp.h
+++ b/libhwcomposer/hwc_mdpcomp.h
@@ -136,9 +136,6 @@
/* configures MPD pipes */
virtual int configure(hwc_context_t *ctx, hwc_layer_1_t *layer,
PipeLayerPair& pipeLayerPair) = 0;
- /* Checks for pipes needed versus pipes available */
- virtual bool arePipesAvailable(hwc_context_t *ctx,
- hwc_display_contents_1_t* list) = 0;
/* Increments mdpCount if 4k2k yuv layer split is enabled.
* updates framebuffer z order if fb lies above source-split layer */
virtual void adjustForSourceSplit(hwc_context_t *ctx,
@@ -268,14 +265,6 @@
virtual bool allocLayerPipes(hwc_context_t *ctx,
hwc_display_contents_1_t* list);
- /* Checks for pipes needed versus pipes available */
- virtual bool arePipesAvailable(hwc_context_t *ctx,
- hwc_display_contents_1_t* list);
-
- /* Checks for video pipes needed versus pipes available */
- virtual bool areVGPipesAvailable(hwc_context_t *ctx,
- hwc_display_contents_1_t* list);
-
/* Increments mdpCount if 4k2k yuv layer split is enabled.
* updates framebuffer z order if fb lies above source-split layer */
virtual void adjustForSourceSplit(hwc_context_t *ctx,
@@ -309,14 +298,6 @@
virtual bool allocLayerPipes(hwc_context_t *ctx,
hwc_display_contents_1_t* list);
- /* Checks for pipes needed versus pipes available */
- virtual bool arePipesAvailable(hwc_context_t *ctx,
- hwc_display_contents_1_t* list);
-
- /* Checks for video pipes needed versus pipes available */
- virtual bool areVGPipesAvailable(hwc_context_t *ctx,
- hwc_display_contents_1_t* list);
-
/* Increments mdpCount if 4k2k yuv layer split is enabled.
* updates framebuffer z order if fb lies above source-split layer */
virtual void adjustForSourceSplit(hwc_context_t *ctx,
@@ -325,9 +306,6 @@
/* configures 4kx2k yuv layer*/
virtual int configure4k2kYuv(hwc_context_t *ctx, hwc_layer_1_t *layer,
PipeLayerPair& PipeLayerPair);
-
- int pipesNeeded(hwc_context_t *ctx, hwc_display_contents_1_t* list,
- int mixer);
};
}; //namespace
diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index d94e0e9..ce2da87 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -213,6 +213,10 @@
ctx->dpyAttr[i].mAsHeightRatio = 0;
}
+ for (uint32_t i = 0; i < HWC_NUM_DISPLAY_TYPES; i++) {
+ ctx->mPrevHwLayerCount[i] = 0;
+ }
+
MDPComp::init(ctx);
ctx->mAD = new AssertiveDisplay(ctx);
@@ -897,6 +901,7 @@
if(prevYuvCount != ctx->listStats[dpy].yuvCount) {
ctx->mVideoTransFlag = true;
}
+
if(dpy == HWC_DISPLAY_PRIMARY) {
ctx->mAD->markDoable(ctx, list);
}
diff --git a/libhwcomposer/hwc_utils.h b/libhwcomposer/hwc_utils.h
index 3393b59..25d1c21 100644
--- a/libhwcomposer/hwc_utils.h
+++ b/libhwcomposer/hwc_utils.h
@@ -483,6 +483,10 @@
eAnimationState mAnimationState[HWC_NUM_DISPLAY_TYPES];
qhwc::HWCVirtualBase *mHWCVirtual;
+ // stores the #numHwLayers of the previous frame
+ // for each display device
+ int mPrevHwLayerCount[HWC_NUM_DISPLAY_TYPES];
+
// stores the primary device orientation
int deviceOrientation;
//Securing in progress indicator
diff --git a/libqservice/QServiceUtils.h b/libqservice/QServiceUtils.h
index a5f4f7f..699164d 100644
--- a/libqservice/QServiceUtils.h
+++ b/libqservice/QServiceUtils.h
@@ -49,7 +49,7 @@
}
inline android::status_t sendSingleParam(uint32_t command, uint32_t value) {
- android::status_t err = (status_t) android::FAILED_TRANSACTION;
+ android::status_t err = (android::status_t) android::FAILED_TRANSACTION;
android::sp<qService::IQService> binder = getBinder();
android::Parcel inParcel, outParcel;
inParcel.writeInt32(value);