commit 121a863a32ab49babd2090cd31dadf527a46eae9
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 09 20:58:49 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 09 20:58:49 2014 -0700
tree c04e06f01f7ed20668f06f71a79848b240e23e78
parent 4977c09e5d19efe4831903cc1e1c38fc3b06eb9c
parent 286cf1202daf57bd0a29ebe00fd711aae345ef57

Merge "hwc: Add error log to MDP Comp simulation failures"

libhwcomposer/hwc_mdpcomp.cpp

diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index 5df0fa0..300a321 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -1771,13 +1771,15 @@
     }
 
     const int numLayers = ctx->listStats[mDpy].numAppLayers;
-
-    if(property_get("debug.hwc.simulate", property, NULL) > 0) {
-        int currentFlags = atoi(property);
-        if(currentFlags != sSimulationFlags) {
-            sSimulationFlags = currentFlags;
-            ALOGE("%s: Simulation Flag read: 0x%x (%d)", __FUNCTION__,
-                    sSimulationFlags, sSimulationFlags);
+    if(mDpy == HWC_DISPLAY_PRIMARY) {
+        sSimulationFlags = 0;
+        if(property_get("debug.hwc.simulate", property, NULL) > 0) {
+            int currentFlags = atoi(property);
+            if(currentFlags != sSimulationFlags) {
+                sSimulationFlags = currentFlags;
+                ALOGI("%s: Simulation Flag read: 0x%x (%d)", __FUNCTION__,
+                        sSimulationFlags, sSimulationFlags);
+            }
         }
     }
     // reset PTOR
@@ -1829,6 +1831,8 @@
             memset(&mCurrentFrame.drop, 0, sizeof(mCurrentFrame.drop));
             mCurrentFrame.dropCount = 0;
             ret = -1;
+            ALOGE_IF(sSimulationFlags && (mDpy == HWC_DISPLAY_PRIMARY),
+                    "MDP Composition Strategies Failed");
         }
     } else {
         ALOGD_IF( isDebug(),"%s: MDP Comp not possible for this frame",