overlay: Remove support for forced pipe configs
Forced pipe configs were used during geometry changes to track bandwidth
in driver, which is no longer the case
Change-Id: I49fb1ca1b7173da2e17ccfc8ce9b447152b9b7b6
diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 02b9317..a805486 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -138,15 +138,6 @@
ctx->layerProp[dpy] = new LayerProp[numAppLayers];
}
-static void handleGeomChange(hwc_context_t *ctx, int dpy,
- hwc_display_contents_1_t *list) {
- /* No point to calling overlay_set on MDP3 */
- if(list->flags & HWC_GEOMETRY_CHANGED &&
- ctx->mMDP.version >= qdutils::MDP_V4_0) {
- ctx->mOverlay->forceSet(dpy);
- }
-}
-
static int hwc_prepare_primary(hwc_composer_device_1 *dev,
hwc_display_contents_1_t *list) {
ATRACE_CALL();
@@ -155,7 +146,6 @@
if (LIKELY(list && list->numHwLayers > 1) &&
ctx->dpyAttr[dpy].isActive) {
reset_layer_prop(ctx, dpy, list->numHwLayers - 1);
- handleGeomChange(ctx, dpy, list);
setListStats(ctx, list, dpy);
#ifdef VPU_TARGET
ctx->mVPUClient->prepare(ctx, list);
@@ -182,7 +172,6 @@
ctx->dpyAttr[dpy].isActive &&
ctx->dpyAttr[dpy].connected) {
reset_layer_prop(ctx, dpy, list->numHwLayers - 1);
- handleGeomChange(ctx, dpy, list);
if(!ctx->dpyAttr[dpy].isPause) {
ctx->dpyAttr[dpy].isConfiguring = false;
setListStats(ctx, list, dpy);
@@ -221,7 +210,6 @@
ctx->dpyAttr[dpy].isActive &&
ctx->dpyAttr[dpy].connected) {
reset_layer_prop(ctx, dpy, list->numHwLayers - 1);
- handleGeomChange(ctx, dpy, list);
if(!ctx->dpyAttr[dpy].isPause) {
ctx->dpyAttr[dpy].isConfiguring = false;
setListStats(ctx, list, dpy);
diff --git a/liboverlay/overlay.cpp b/liboverlay/overlay.cpp
index e6da3c5..ad23e84 100644
--- a/liboverlay/overlay.cpp
+++ b/liboverlay/overlay.cpp
@@ -68,7 +68,6 @@
PipeBook::resetUse(i);
PipeBook::resetAllocation(i);
}
- sForceSetBitmap = 0;
mDumpStr[0] = '\0';
#ifdef USES_QSEED_SCALAR
@@ -197,19 +196,14 @@
if(mPipeBook[index].mPipe->commit()) {
ret = true;
PipeBook::setUse((int)dest);
- if(sForceSetBitmap & (1 << mPipeBook[index].mDisplay)) {
- mPipeBook[index].mPipe->forceSet();
- }
} else {
int dpy = mPipeBook[index].mDisplay;
- for(int i = 0; i < PipeBook::NUM_PIPES; i++)
+ for(int i = 0; i < PipeBook::NUM_PIPES; i++) {
if (mPipeBook[i].mDisplay == dpy) {
PipeBook::resetAllocation(i);
PipeBook::resetUse(i);
- if(mPipeBook[i].valid()) {
- mPipeBook[i].mPipe->forceSet();
- }
}
+ }
}
return ret;
}
@@ -437,9 +431,6 @@
// Mark as available for this round
PipeBook::resetUse(i);
PipeBook::resetAllocation(i);
- if(mPipeBook[i].valid()) {
- mPipeBook[i].mPipe->forceSet();
- }
}
}
}
@@ -500,7 +491,6 @@
int Overlay::sDpyFbMap[DPY_MAX] = {0, -1, -1};
int Overlay::sDMAMode = DMA_LINE_MODE;
bool Overlay::sDMAMultiplexingSupported = false;
-int Overlay::sForceSetBitmap = 0;
int Overlay::PipeBook::NUM_PIPES = 0;
int Overlay::PipeBook::sPipeUsageBitmap = 0;
int Overlay::PipeBook::sLastUsageBitmap = 0;
diff --git a/liboverlay/overlay.h b/liboverlay/overlay.h
index 48825ea..fe855c1 100644
--- a/liboverlay/overlay.h
+++ b/liboverlay/overlay.h
@@ -120,8 +120,6 @@
void getDump(char *buf, size_t len);
/* Reset usage and allocation bits on all pipes for given display */
void clear(int dpy);
- /* Marks the display, whose pipes need to be forcibaly configured */
- void forceSet(const int& dpy);
/* Closes open pipes, called during startup */
static int initOverlay();
@@ -212,7 +210,6 @@
static int sDpyFbMap[DPY_MAX];
static int sDMAMode;
static bool sDMAMultiplexingSupported;
- static int sForceSetBitmap;
static void *sLibScaleHandle;
static scale::Scale *sScale;
};
@@ -289,10 +286,6 @@
return sDpyFbMap[dpy];
}
-inline void Overlay::forceSet(const int& dpy) {
- sForceSetBitmap |= (1 << dpy);
-}
-
inline scale::Scale *Overlay::getScalar() {
return sScale;
}
diff --git a/liboverlay/overlayCtrlData.h b/liboverlay/overlayCtrlData.h
index 18ef5e6..1b26b66 100644
--- a/liboverlay/overlayCtrlData.h
+++ b/liboverlay/overlayCtrlData.h
@@ -87,7 +87,6 @@
void dump() const;
/* Return the dump in the specified buffer */
void getDump(char *buf, size_t len);
- void forceSet();
private:
// mdp ctrl struct(info e.g.)
@@ -232,10 +231,6 @@
mMdp.getDump(buf, len);
}
-inline void Ctrl::forceSet() {
- mMdp.forceSet();
-}
-
inline Data::Data() {
mMdp.reset();
}
diff --git a/liboverlay/overlayMdp.cpp b/liboverlay/overlayMdp.cpp
index fbb173e..006e05d 100644
--- a/liboverlay/overlayMdp.cpp
+++ b/liboverlay/overlayMdp.cpp
@@ -69,7 +69,6 @@
mLkgo.id = MSMFB_NEW_REQUEST;
mOrientation = utils::OVERLAY_TRANSFORM_0;
mDownscale = 0;
- mForceSet = false;
mDpy = 0;
#ifdef USES_POST_PROCESSING
mPPChanged = false;
@@ -211,8 +210,7 @@
doDownscale();
- if(this->ovChanged() || mForceSet) {
- mForceSet = false;
+ if(this->ovChanged()) {
if(!mdp_wrapper::setOverlay(mFd.getFD(), mOVInfo)) {
ALOGE("MdpCtrl failed to setOverlay, restoring last known "
"good ov info");
diff --git a/liboverlay/overlayMdp.h b/liboverlay/overlayMdp.h
index 6dd3976..3cb6a41 100644
--- a/liboverlay/overlayMdp.h
+++ b/liboverlay/overlayMdp.h
@@ -83,7 +83,6 @@
utils::Dim getSrcRectDim() const;
/* setVisualParam */
bool setVisualParams(const MetaData_t& data);
- void forceSet();
private:
/* Perform transformation calculations */
@@ -133,7 +132,6 @@
/* FD for the mdp fbnum */
OvFD mFd;
int mDownscale;
- bool mForceSet;
int mDpy;
#ifdef USES_POST_PROCESSING
@@ -348,10 +346,6 @@
mOVInfo.flags |= MDP_SOURCE_ROTATED_90;
}
-inline void MdpCtrl::forceSet() {
- mForceSet = true;
-}
-
/////// MdpCtrl3D //////
inline MdpCtrl3D::MdpCtrl3D() { reset(); }
diff --git a/liboverlay/pipes/overlayGenPipe.cpp b/liboverlay/pipes/overlayGenPipe.cpp
index c03378b..e0b580b 100644
--- a/liboverlay/pipes/overlayGenPipe.cpp
+++ b/liboverlay/pipes/overlayGenPipe.cpp
@@ -167,10 +167,6 @@
return true;
}
-void GenericPipe::forceSet() {
- mCtrlData.ctrl.forceSet();
-}
-
int GenericPipe::getPipeId() {
return mCtrlData.ctrl.getPipeId();
}
diff --git a/liboverlay/pipes/overlayGenPipe.h b/liboverlay/pipes/overlayGenPipe.h
index 5c963bc..ecdd001 100644
--- a/liboverlay/pipes/overlayGenPipe.h
+++ b/liboverlay/pipes/overlayGenPipe.h
@@ -75,10 +75,6 @@
void dump() const;
/* Return the dump in the specified buffer */
void getDump(char *buf, size_t len);
- /* Marks the pipe for forcible setting of params
- * even if they haven't changed
- */
- void forceSet();
int getPipeId();
private: