commit eaf679142b75c55735e33bdd9ddd26d8294c4070
author Saurabh Shah <saurshah@codeaurora.org> Wed Oct 10 17:33:14 2012 -0700
committer Iliyan Malchev <malchev@google.com> Mon Oct 15 16:47:08 2012 -0700
tree f4a638a07d5f00995d97a64db8e5ddcc3e4d8a8d
parent 40a1cc58d298a8d2e61df8c3be0d85ddf6996d98

hwc: Return failure code if hwc_set fails to draw

Check for errors while drawing the layers in hwc_set.

Return -1 in the error case so that framework doesn't wait on fences.

Bug: 7284105
Change-Id: I024f9ca07faf64d6b90d4f483164dc15c0d7992c
Signed-off-by: Iliyan Malchev <malchev@google.com>

libhwcomposer/hwc.cpp

diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 6c23846..a2ea3c9 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -254,6 +254,8 @@
 }
 
 static int hwc_set_primary(hwc_context_t *ctx, hwc_display_contents_1_t* list) {
+    int ret = 0;
+
     if (LIKELY(list && list->numHwLayers > 1) &&
         ctx->dpyAttr[HWC_DISPLAY_PRIMARY].isActive) {
         uint32_t last = list->numHwLayers - 1;
@@ -261,20 +263,29 @@
 
         hwc_sync(ctx, list, HWC_DISPLAY_PRIMARY);
 
-        VideoOverlay::draw(ctx, list, HWC_DISPLAY_PRIMARY);
-        MDPComp::draw(ctx, list);
-
+        if (!VideoOverlay::draw(ctx, list, HWC_DISPLAY_PRIMARY)) {
+            ALOGE("%s: VideoOverlay::draw fail!", __FUNCTION__);
+            ret = -1;
+        }
+        if (MDPComp::draw(ctx, list)) {
+            ALOGE("%s: MDPComp::draw fail!", __FUNCTION__);
+            ret = -1;
+        }
         //TODO We dont check for SKIP flag on this layer because we need PAN
         //always. Last layer is always FB
         if(list->hwLayers[last].compositionType == HWC_FRAMEBUFFER_TARGET) {
-            ctx->mFbDev->post(ctx->mFbDev, fbLayer->handle);
+            if (ctx->mFbDev->post(ctx->mFbDev, fbLayer->handle)) {
+                ALOGE("%s: ctx->mFbDev->post fail!", __FUNCTION__);
+                return -1;
+            }
         }
     }
-    return 0;
+    return ret;
 }
 
 static int hwc_set_external(hwc_context_t *ctx,
         hwc_display_contents_1_t* list) {
+    int ret = 0;
     Locker::Autolock _l(ctx->mExtSetLock);
 
     if (LIKELY(list && list->numHwLayers > 1) &&
@@ -285,16 +296,25 @@
 
         hwc_sync(ctx, list, HWC_DISPLAY_EXTERNAL);
 
-        VideoOverlay::draw(ctx, list, HWC_DISPLAY_EXTERNAL);
+        if (!VideoOverlay::draw(ctx, list, HWC_DISPLAY_EXTERNAL)) {
+            ALOGE("%s: VideoOverlay::draw fail!", __FUNCTION__);
+            ret = -1;
+        }
 
         private_handle_t *hnd = (private_handle_t *)fbLayer->handle;
         if(fbLayer->compositionType == HWC_FRAMEBUFFER_TARGET &&
                 !(fbLayer->flags & HWC_SKIP_LAYER) && hnd) {
-            UIMirrorOverlay::draw(ctx, fbLayer);
+            if (!UIMirrorOverlay::draw(ctx, fbLayer)) {
+                ALOGE("%s: UIMirrorOverlay::draw fail!", __FUNCTION__);
+                ret = -1;
+            }
         }
-        ctx->mExtDisplay->post();
+        if (!ctx->mExtDisplay->post()) {
+            ALOGE("%s: ctx->mExtDisplay->post fail!", __FUNCTION__);
+            return -1;
+        }
     }
-    return 0;
+    return ret;
 }
 
 static int hwc_set(hwc_composer_device_1 *dev,