commit 48a6954594cd33170a493b85a95246741cbd3ce6
author Benoit Goby <benoit@android.com> Fri Sep 21 17:12:28 2012 -0700
committer Benoit Goby <benoit@android.com> Wed Sep 26 12:02:42 2012 -0700
tree 694bc13a60b1df1e934fa18943413261b671fd63
parent 87424342bc6e8494eccdd8a179a85045d7198692

hwc: Ignore content for HDMI when it is not enabled

Bug: 7231798
Change-Id: I82d4baa3c1b84c2f16e6b633f4e1457730333124

libhwc/hwc.cpp

diff --git a/libhwc/hwc.cpp b/libhwc/hwc.cpp
index 6e4fc2a..1dea15a 100644
--- a/libhwc/hwc.cpp
+++ b/libhwc/hwc.cpp
@@ -949,10 +949,6 @@
     }
 
     if (hdmi_contents) {
-        if (!pdev->hdmi_enabled) {
-            ALOGE("HDMI disabled; can't prepare contents of external display");
-            return -EINVAL;
-        }
         int err = exynos5_prepare_hdmi(pdev, hdmi_contents);
         if (err)
             return err;
@@ -1320,6 +1316,13 @@
                           i, strerror(errno));
             close(layer.acquireFenceFd);
         }
+    }
+
+    if (!pdev->hdmi_enabled)
+        return 0;
+
+    for (size_t i = 0; i < contents->numHwLayers; i++) {
+        hwc_layer_1_t &layer = contents->hwLayers[i];
 
         if (layer.compositionType == HWC_FRAMEBUFFER_TARGET) {
             if (!layer.handle)
@@ -1353,10 +1356,6 @@
     }
 
     if (hdmi_contents) {
-        if (!pdev->hdmi_enabled) {
-            ALOGE("HDMI disabled; can't set contents of external display");
-            return -EINVAL;
-        }
         int err = exynos5_set_hdmi(pdev, hdmi_contents);
         if (err)
             return err;