commit 3e95e9f31d4a40a84f5848d8159b0d2c99d247a8
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 03 11:40:07 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 03 11:40:07 2013 -0700
tree 73d2873a578d3f711e4e066e44be0641f0659005
parent a71411f6ec751e4520455133b04ba74d8a1d9eb7
parent 6be7c78da9174570c7ec21157b384868ca4d97e3

Merge "hwc: mdpcomp: Make all pipes available if a frame fails"

libhwcomposer/hwc_mdpcomp.cpp

diff --git a/libhwcomposer/hwc_mdpcomp.cpp b/libhwcomposer/hwc_mdpcomp.cpp
index f2217b9..85450d2 100644
--- a/libhwcomposer/hwc_mdpcomp.cpp
+++ b/libhwcomposer/hwc_mdpcomp.cpp
@@ -785,12 +785,14 @@
                         mCurrentFrame.fbZ)) {
                 ALOGE("%s configure framebuffer failed", __func__);
                 reset(numLayers, list);
+                ctx->mOverlay->clear(mDpy);
                 return -1;
             }
         }
         //Acquire and Program MDP pipes
         if(!programMDP(ctx, list)) {
             reset(numLayers, list);
+            ctx->mOverlay->clear(mDpy);
             return -1;
         } else { //Success
             //Any change in composition types needs an FB refresh
@@ -822,11 +824,13 @@
             if(!ctx->mFBUpdate[mDpy]->prepare(ctx, list, mCurrentFrame.fbZ)) {
                 ALOGE("%s configure framebuffer failed", __func__);
                 reset(numLayers, list);
+                ctx->mOverlay->clear(mDpy);
                 return -1;
             }
         }
         if(!programYUV(ctx, list)) {
             reset(numLayers, list);
+            ctx->mOverlay->clear(mDpy);
             return -1;
         }
     } else {