qdutils: Refactor idletimeout fallback mechanism.
1. Use kernel timer interrupt to signal about the timeout to
Invalidator thread and fallback to GPU composition.
2. This implementation avoids waking up the Invalidator thread for
every idletimeout value during continuous update.
Change-Id: I4370f10a0ca06b5cb1e7bdcb047e9c8daec51afb
diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index 6ff1aa3..c773c91 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -38,6 +38,7 @@
IdleInvalidator *MDPComp::idleInvalidator = NULL;
bool MDPComp::sIdleFallBack = false;
+bool MDPComp::sHandleTimeout = false;
bool MDPComp::sDebugLogs = false;
bool MDPComp::sEnabled = false;
bool MDPComp::sEnableMixedMode = true;
@@ -171,7 +172,12 @@
ALOGE("%s: received empty data in timer callback", __FUNCTION__);
return;
}
-
+ Locker::Autolock _l(ctx->mDrawLock);
+ // Handle timeout event only if the previous composition is MDP or MIXED.
+ if(!sHandleTimeout) {
+ ALOGD_IF(isDebug(), "%s:Do not handle this timeout", __FUNCTION__);
+ return;
+ }
if(!ctx->proc) {
ALOGE("%s: HWC proc not registered", __FUNCTION__);
return;
@@ -1619,9 +1625,10 @@
return true;
}
- /* reset Invalidator */
- if(idleInvalidator && !sIdleFallBack && mCurrentFrame.mdpCount)
- idleInvalidator->handleUpdateEvent();
+ // Set the Handle timeout to true for MDP or MIXED composition.
+ if(idleInvalidator && !sIdleFallBack && mCurrentFrame.mdpCount) {
+ sHandleTimeout = true;
+ }
overlay::Overlay& ov = *ctx->mOverlay;
LayerProp *layerProp = ctx->layerProp[mDpy];
@@ -1865,9 +1872,10 @@
return true;
}
- /* reset Invalidator */
- if(idleInvalidator && !sIdleFallBack && mCurrentFrame.mdpCount)
- idleInvalidator->handleUpdateEvent();
+ // Set the Handle timeout to true for MDP or MIXED composition.
+ if(idleInvalidator && !sIdleFallBack && mCurrentFrame.mdpCount) {
+ sHandleTimeout = true;
+ }
overlay::Overlay& ov = *ctx->mOverlay;
LayerProp *layerProp = ctx->layerProp[mDpy];
diff --git a/libhwcomposer/hwc_mdpcomp.h b/libhwcomposer/hwc_mdpcomp.h
index f2a8eda..e7566f4 100644
--- a/libhwcomposer/hwc_mdpcomp.h
+++ b/libhwcomposer/hwc_mdpcomp.h
@@ -52,7 +52,7 @@
/* Initialize MDP comp*/
static bool init(hwc_context_t *ctx);
static void resetIdleFallBack() { sIdleFallBack = false; }
- static void reset() { sBwClaimed = 0.0; };
+ static void reset() { sBwClaimed = 0.0; sHandleTimeout = false; };
protected:
enum { MAX_SEC_LAYERS = 1 }; //TODO add property support
@@ -231,6 +231,8 @@
static bool sEnablePartialFrameUpdate;
static bool sDebugLogs;
static bool sIdleFallBack;
+ /* Handles the timeout event from kernel, if the value is set to true */
+ static bool sHandleTimeout;
static int sMaxPipesPerMixer;
//Max bandwidth. Value is in GBPS. For ex: 2.3 means 2.3GBPS
static double sMaxBw;