commit 4f4399698e74d09820621027cf0f0e001f1c064a
author Benoit Goby <benoit@android.com> Fri Sep 21 17:16:45 2012 -0700
committer Benoit Goby <benoit@android.com> Wed Sep 26 12:03:21 2012 -0700
tree c5fcd019934ecb656c4f09232b702ffe0c8305fc
parent 48a6954594cd33170a493b85a95246741cbd3ce6

hwc: Remove force_fb flag, there's always content for HDMI

Bug: 7123196
Change-Id: Id0327b5fd7d3a7777c2dc13a99e51d5b11864388

libhwc/hwc.cpp

diff --git a/libhwc/hwc.cpp b/libhwc/hwc.cpp
index 1dea15a..cdcc5e5 100644
--- a/libhwc/hwc.cpp
+++ b/libhwc/hwc.cpp
@@ -701,13 +701,13 @@
 }
 
 static int exynos5_prepare_fimd(exynos5_hwc_composer_device_1_t *pdev,
-        hwc_display_contents_1_t* contents, bool force_fb)
+        hwc_display_contents_1_t* contents)
 {
     ALOGV("preparing %u layers for FIMD", contents->numHwLayers);
 
     memset(pdev->bufs.gsc_map, 0, sizeof(pdev->bufs.gsc_map));
 
-    force_fb = force_fb || pdev->force_gpu;
+    bool force_fb = pdev->force_gpu;
     for (size_t i = 0; i < NUM_HW_WINDOWS; i++)
         pdev->bufs.overlay_map[i] = -1;
 
@@ -942,8 +942,7 @@
     }
 
     if (fimd_contents) {
-        bool force_fb = pdev->hdmi_enabled && !hdmi_contents;
-        int err = exynos5_prepare_fimd(pdev, fimd_contents, force_fb);
+        int err = exynos5_prepare_fimd(pdev, fimd_contents);
         if (err)
             return err;
     }