commit 143a9ee660c5bfdc542604048e29a951d45afdd7
author Mingu Jeon <mingu85.jeon@samsung.com> Mon Aug 12 12:46:56 2019 +0900
committer HyunKyung Kim <hk310.kim@samsung.com> Thu Feb 20 17:16:32 2020 +0900
tree 6de0f188370d2a52d8b801a5d5d889d6d1fe84e2
parent ea1952c44253e9d1eab2832021633220ad4b3eb0

libhwc2.1: Add exception code for VTS

Bug: 140158079
Bug: 140158240
Change-Id: I6c38c16049d6fec0028a0ec8c2b358b62d43fa7e
Signed-off-by: Mingu Jeon <mingu85.jeon@samsung.com>
Signed-off-by: HyunKyung Kim <hk310.kim@samsung.com>

libhwc2.1/libdevice/ExynosDisplay.cpp

diff --git a/libhwc2.1/libdevice/ExynosDisplay.cpp b/libhwc2.1/libdevice/ExynosDisplay.cpp
index 71ffe1c..a44f271 100644
--- a/libhwc2.1/libdevice/ExynosDisplay.cpp
+++ b/libhwc2.1/libdevice/ExynosDisplay.cpp
@@ -2569,7 +2569,7 @@
         mLastRetireFence = fence_close(mLastRetireFence, this,
                 FENCE_TYPE_RETIRE, FENCE_IP_DPP);
         mRenderingState = RENDERING_STATE_PRESENTED;
-        return ret;
+        return 0;
     }
 
     if (!checkFrameValidation()) {
@@ -2867,7 +2867,7 @@
     Mutex::Autolock lock(mDisplayMutex);
 
 #ifndef USES_DOZEMODE
-    if ((mode == HWC_POWER_MODE_DOZE) || (mode == HWC_POWER_MODE_DOZE_SUSPEND))
+    if ((mode == HWC2_POWER_MODE_DOZE) || (mode == HWC2_POWER_MODE_DOZE_SUSPEND))
         return HWC2_ERROR_UNSUPPORTED;
 #endif
 

libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp

diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp
index bca4f38..f49d534 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp
@@ -88,6 +88,11 @@
         int32_t /*hwc2_power_mode_t*/ mode) {
     Mutex::Autolock lock(mDisplayMutex);
 
+#ifndef USES_DOZEMODE
+    if ((mode == HWC2_POWER_MODE_DOZE) || (mode == HWC2_POWER_MODE_DOZE_SUSPEND))
+        return HWC2_ERROR_UNSUPPORTED;
+#endif
+
     /* TODO state check routine should be added */
     int fb_blank = -1;