Revert "HACK: hwc: reserve gscaler 2 for camera"

This reverts commit 49e5108eb6444e15edb323b957af9ae36c3e03b5.

diff --git a/libhwc/hwc.cpp b/libhwc/hwc.cpp
index 94ed19cf2ca01749488022b47051f1d6174e792f..344d09338471e46b439bfef203e53ff7adbb7b19 100644 (file)
--- a/libhwc/hwc.cpp
+++ b/libhwc/hwc.cpp
@@ -55,10 +55,9 @@ typedef android::Vector<struct hwc_callback_entry> hwc_callback_queue_t;
 const size_t NUM_HW_WINDOWS = 5;
 const size_t NO_FB_NEEDED = NUM_HW_WINDOWS + 1;
 const size_t MAX_PIXELS = 2560 * 1600 * 2;
-const size_t NUM_GSC_UNITS = 3;
+const size_t NUM_GSC_UNITS = 4;
 const size_t GSC_W_ALIGNMENT = 16;
 const size_t GSC_H_ALIGNMENT = 16;
-const int CAMERA_GSC_IDX = 2;
 
 struct exynos5_hwc_composer_device_1_t;
 
@@ -666,8 +665,6 @@ static int exynos5_prepare(hwc_composer_device_1_t *dev,
                     pdev->bufs.gsc_map[i].mode =
                             exynos5_gsc_map_t::GSC_M2M;
                     pdev->bufs.gsc_map[i].idx = nextGsc++;
-                    if (nextGsc == CAMERA_GSC_IDX)
-                        nextGsc++;
                 }
             }
             nextWindow++;