libhwc: Move constants to header to allow for abstraction

Change-Id: Ib01f8cfc078daf7dd67a31c48c0fc379cff5329b

diff --git a/include/exynos_hwc.h b/include/exynos_hwc.h
new file mode 100644 (file)
index 0000000..17c6116
--- /dev/null
+++ b/include/exynos_hwc.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#ifndef EXYNOS_HWC_H_
+#define EXYNOS_HWC_H_
+
+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 GSC_W_ALIGNMENT = 16;
+const size_t GSC_H_ALIGNMENT = 16;
+const size_t GSC_DST_CROP_W_ALIGNMENT_RGB888 = 32;
+const size_t GSC_DST_W_ALIGNMENT_RGB888 = 32;
+const size_t GSC_DST_H_ALIGNMENT_RGB888 = 1;
+const size_t FIMD_GSC_IDX = 0;
+const size_t HDMI_GSC_IDX = 1;
+const int AVAILABLE_GSC_UNITS[] = { 0, 3 };
+const size_t NUM_GSC_UNITS = sizeof(AVAILABLE_GSC_UNITS) /
+        sizeof(AVAILABLE_GSC_UNITS[0]);
+const size_t BURSTLEN_BYTES = 16 * 8;
+const size_t NUM_HDMI_BUFFERS = 3;
+
+const char *VSYNC_FD = "/sys/devices/platform/exynos5-fb.1/vsync";
+
+const char *HDMI_MIXER_0 = "/dev/v4l-subdev7";
+const char *HDMI_LAYERS[] = { "/dev/video16", "/dev/video17" };
+
+static inline void setup_alpha_plane(s3c_fb_win_config *cfg, const int &value)
+{
+       // dummy
+       //cfg->plane_alpha = value;
+}
+
+#endif //__EXYNOS_HWC_H__

diff --git a/libhwc/hwc.cpp b/libhwc/hwc.cpp
index df04fe27f57217f23a4dbcfd48ab504e7068ab9e..b4e4a8eef1f43561b4e702723b5aa166340180dc 100644 (file)
--- a/libhwc/hwc.cpp
+++ b/libhwc/hwc.cpp
@@ -47,26 +47,11 @@
 #include "ion.h"
 #include "gralloc_priv.h"
 #include "exynos_gscaler.h"
+#include "exynos_hwc.h"
 #include "exynos_format.h"
 #include "exynos_v4l2.h"
 #include "s5p_tvout_v4l2.h"
 
-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 GSC_W_ALIGNMENT = 16;
-const size_t GSC_H_ALIGNMENT = 16;
-const size_t GSC_DST_CROP_W_ALIGNMENT_RGB888 = 32;
-const size_t GSC_DST_W_ALIGNMENT_RGB888 = 32;
-const size_t GSC_DST_H_ALIGNMENT_RGB888 = 1;
-const size_t FIMD_GSC_IDX = 0;
-const size_t HDMI_GSC_IDX = 1;
-const int AVAILABLE_GSC_UNITS[] = { 0, 3 };
-const size_t NUM_GSC_UNITS = sizeof(AVAILABLE_GSC_UNITS) /
-        sizeof(AVAILABLE_GSC_UNITS[0]);
-const size_t BURSTLEN_BYTES = 16 * 8;
-const size_t NUM_HDMI_BUFFERS = 3;
-
 struct exynos5_hwc_composer_device_1_t;
 
 struct exynos5_gsc_map_t {
@@ -1363,6 +1348,9 @@ static void exynos5_config_handle(private_handle_t *handle,
     cfg.stride = handle->stride * bpp / 8;
     cfg.blending = exynos5_blending_to_s3c_blending(blending);
     cfg.fence_fd = fence_fd;
+
+    // Setup the alpha plane
+    setup_alpha_plane(&cfg, 255);
 }
 
 static void exynos5_config_overlay(hwc_layer_1_t *layer, s3c_fb_win_config &cfg,
@@ -2122,31 +2110,25 @@ static int exynos5_open(const struct hw_module_t *module, const char *name,
         for (size_t j = 0; j < NUM_GSC_DST_BUFS; j++)
             dev->gsc[i].dst_buf_fence[j] = -1;
 
-    dev->hdmi_mixer0 = open("/dev/v4l-subdev7", O_RDWR);
+    dev->hdmi_mixer0 = open(HDMI_MIXER_0, O_RDWR);
     if (dev->hdmi_mixer0 < 0)
         ALOGE("failed to open hdmi mixer0 subdev");
 
     dev->hdmi_layers[0].id = 0;
-    dev->hdmi_layers[0].fd = open("/dev/video16", O_RDWR);
-    if (dev->hdmi_layers[0].fd < 0) {
+    dev->hdmi_layers[0].fd = open(HDMI_LAYERS[0], O_RDWR);
+    if (dev->hdmi_layers[0].fd < 0)
         ALOGE("failed to open hdmi layer0 device");
-        ret = dev->hdmi_layers[0].fd;
-        goto err_mixer0;
-    }
 
     dev->hdmi_layers[1].id = 1;
-    dev->hdmi_layers[1].fd = open("/dev/video17", O_RDWR);
-    if (dev->hdmi_layers[1].fd < 0) {
+    dev->hdmi_layers[1].fd = open(HDMI_LAYERS[1], O_RDWR);
+    if (dev->hdmi_layers[1].fd < 0)
         ALOGE("failed to open hdmi layer1 device");
-        ret = dev->hdmi_layers[1].fd;
-        goto err_hdmi0;
-    }
 
-    dev->vsync_fd = open("/sys/devices/platform/exynos5-fb.1/vsync", O_RDONLY);
+    dev->vsync_fd = open(VSYNC_FD, O_RDONLY);
     if (dev->vsync_fd < 0) {
         ALOGE("failed to open vsync attribute");
         ret = dev->vsync_fd;
-        goto err_hdmi1;
+        goto err_vsync;
     }
 
     sw_fd = open("/sys/class/switch/hdmi/state", O_RDONLY);
@@ -2193,13 +2175,6 @@ static int exynos5_open(const struct hw_module_t *module, const char *name,
 
 err_vsync:
     close(dev->vsync_fd);
-err_mixer0:
-    if (dev->hdmi_mixer0 >= 0)
-        close(dev->hdmi_mixer0);
-err_hdmi1:
-    close(dev->hdmi_layers[0].fd);
-err_hdmi0:
-    close(dev->hdmi_layers[1].fd);
 err_ioctl:
     close(dev->fd);
 err_open_fb: