commit ce9d80944cd9f826f846843c83c3c095449bcdc9
author chen.wang1 <chen.wang1@amlogic.com> Thu Jan 02 15:59:09 2025 +0800
committer Dongjin Kim <tobetter@gmail.com> Thu Jan 09 05:34:40 2025 +0000
tree ee0b32c3ee8425fab6b6b81a9943e401de68ba31
parent 2a7a7656b7323f3488fa00264b555c3ceece86a4

weston: HDR Priority automatically switches to SDR, which should be HDR [1/1]

PD#SWPL-198032

Problem:
HDR Priority automatically switches to SDR, which should be HDR

Solution:
Modify the setBootEnv judgment criteria

Verify:
S7D

Change-Id: I74bf3f5d0c0092597ae663c24f2b47c962a8d043
Signed-off-by: chen.wang1 <chen.wang1@amlogic.com>

libweston/modepolicy/ModePolicy.cpp

diff --git a/libweston/modepolicy/ModePolicy.cpp b/libweston/modepolicy/ModePolicy.cpp
index f435c40..88956d1 100644
--- a/libweston/modepolicy/ModePolicy.cpp
+++ b/libweston/modepolicy/ModePolicy.cpp
@@ -358,20 +358,25 @@
 }
 
 int32_t ModePolicy::setHdrPriority(int32_t type) {
-    MESON_LOGI("setHdrPriority is [%s]\n", meson_hdrPriorityToString(type));
+    MESON_LOGI("setHdrPriority is [%s] getHdrPriority is [%s]\n", meson_hdrPriorityToString(type),
+            meson_hdrPriorityToString(getHdrPriority()));
 
-    getConnectorData(&mConData, &mDvInfo);
-    meson_mode_set_policy_input(mModeConType, &mConData);
-    getDisplayMode(mCurrentMode);
+    if (getHdrPriority() != type) {
+        getConnectorData(&mConData, &mDvInfo);
+        meson_mode_set_policy_input(mModeConType, &mConData);
+        getDisplayMode(mCurrentMode);
 
-    if (!meson_mode_support_mode(mModeConType, type, mCurrentMode)) {
-        std::string value = std::to_string(type);
+        if (!meson_mode_support_mode(mModeConType, type, mCurrentMode)) {
+            std::string value = std::to_string(type);
 
-        setBootEnv(UBOOTENV_HDR_PRIORITY, value.c_str());
-        setSourceOutputMode(mCurrentMode);
+            setBootEnv(UBOOTENV_HDR_PRIORITY, value.c_str());
+            setSourceOutputMode(mCurrentMode);
+        } else {
+            MESON_LOGD("%s mode check failed", __func__);
+            return -EINVAL;
+        }
     } else {
-        MESON_LOGD("%s mode check failed", __func__);
-        return -EINVAL;
+        MESON_LOGI("setHdrPriority is [%d] and getHdrPriority [%d],They are equals", type, getHdrPriority());
     }
 
     return 0;