commit ad8f1817c5b147ecb39d942ddffdb59132db2747
author HyunKyung Kim <hk310.kim@samsung.com> Wed Apr 10 10:06:10 2019 +0900
committer HyunKyung Kim <hk310.kim@samsung.com> Mon Oct 28 13:47:53 2019 +0900
tree 6aab19679f84160c52450d986cda4696e71e088b
parent ada7e5557d97505701d25498a96e3fac01f313de

libhwc2.1: Set properties of plane for overlay in drm interface

Only the first plane was enabled before this patch.
This patch enables plane that is mapped with assigned DPU channel.
This patch sets properties of plane for rotation and blending.

Change-Id: Ie77dbe174ff05a4c3d16e2e5c529f14312a9265d
Signed-off-by: HyunKyung Kim <hk310.kim@samsung.com>

libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp

diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
index 2663da1..462e767 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
@@ -383,6 +383,17 @@
     return 0;
 }
 
+int ExynosDisplayDrmInterface::getDeconChannel(ExynosMPP *otfMPP)
+{
+    int32_t channelNum = sizeof(IDMA_CHANNEL_MAP)/sizeof(dpp_channel_map_t);
+    for (int i = 0; i < channelNum; i++) {
+        if((IDMA_CHANNEL_MAP[i].type == otfMPP->mPhysicalType) &&
+           (IDMA_CHANNEL_MAP[i].index == otfMPP->mPhysicalIndex))
+            return IDMA_CHANNEL_MAP[i].channel;
+    }
+    return -EINVAL;
+}
+
 int32_t ExynosDisplayDrmInterface::deliverWinConfigData()
 {
     int ret = NO_ERROR;
@@ -412,11 +423,15 @@
         exynos_win_config_data& config = mExynosDisplay->mDpuData.configs[i];
         if (config.state == config.WIN_STATE_BUFFER) {
             uint32_t fb_id = 0;
-            /*
-             * [HACK]: We can use only the first plane
-             * We should map window to plane
-             */
-            auto &plane = mDrmDevice->planes().at(0);
+            int channelId = 0;
+            if ((channelId = getDeconChannel(config.assignedMPP)) < 0) {
+                HWC_LOGE(mExynosDisplay, "%s:: Failed to get channel id (%d)",
+                        __func__, channelId);
+                ret = -EINVAL;
+                drmReq.setError(ret, this);
+                return ret;
+            }
+            auto &plane = mDrmDevice->planes().at(channelId);
             /* Set this plane is enabled */
             planeEnableInfo[plane->id()] = 1;
 
@@ -494,13 +509,10 @@
                 return ret;
             }
 
-            /* TODO: Set rotation, blending, alpha */
-            uint64_t rotation = DRM_MODE_ROTATE_0;
-            uint64_t blend;
-            //uint32_t blending =  config.blending;
-            uint32_t blending = HWC2_BLEND_MODE_NONE;
+            uint64_t rotation = halTransformToDrmRot(config.transform);
+            uint64_t blend = 0;
             if (plane->blend_property().id()) {
-                switch (blending) {
+                switch (config.blending) {
                     case HWC2_BLEND_MODE_PREMULTIPLIED:
                         std::tie(blend, ret) = plane->blend_property().GetEnumValueWithName(
                                 "Pre-multiplied");

libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.h

diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.h b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.h
index e13e66b..1b8288e 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.h
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.h
@@ -78,6 +78,7 @@
         int32_t applyDisplayMode();
         String8& dumpAtomicCommitInfo(String8 &result, drmModeAtomicReqPtr pset, bool debugPrint = false);
         int32_t chosePreferredConfig();
+        int getDeconChannel(ExynosMPP *otfMPP);
     protected:
         struct ModeState {
             bool needs_modeset = false;