commit 497cedd094970749fe408989ece7e36384e38c7b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:24:47 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:24:47 2023 +0000
tree 2a352f4e2f769620aead18e156eb3bb69cfdc483
parent 371db300dde28fb24a3a93c76cbd4a559223f434
parent c10c1f3fe74ca56262577066afc7e2693eb946f7

Snap for 10103804 from c10c1f3fe74ca56262577066afc7e2693eb946f7 to mainline-tzdata5-release

Change-Id: If6e0d580b627e9213b7e17f62a59a9f141d55cbc

libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp

diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
index 082db52..2bf949f 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
@@ -257,9 +257,10 @@
     if ((hint < HAL_COLOR_TRANSFORM_IDENTITY) ||
         (hint > HAL_COLOR_TRANSFORM_CORRECT_TRITANOPIA))
         return HWC2_ERROR_BAD_PARAMETER;
-    ALOGI("%s:: %d, %d", __func__, mColorTransformHint, hint);
-    if (mColorTransformHint != hint)
+    if (mColorTransformHint != hint) {
+        ALOGI("%s:: %d -> %d", __func__, mColorTransformHint, hint);
         setGeometryChanged(GEOMETRY_DISPLAY_COLOR_TRANSFORM_CHANGED);
+    }
     mColorTransformHint = hint;
 #ifdef HWC_SUPPORT_COLOR_TRANSFORM
     mDisplaySceneInfo.setColorTransform(matrix);
@@ -539,34 +540,31 @@
         layerColorData.dynamic_metadata.is_valid = true;
     }
     updateInfoSingleVal(layerColorData.dynamic_metadata.display_maximum_luminance,
-            exynosHdrDynamicInfo.data.display_maximum_luminance);
+                        exynosHdrDynamicInfo.data.targeted_system_display_maximum_luminance);
 
     if (!std::equal(layerColorData.dynamic_metadata.maxscl.begin(),
-                layerColorData.dynamic_metadata.maxscl.end(),
-                exynosHdrDynamicInfo.data.maxscl)) {
+                    layerColorData.dynamic_metadata.maxscl.end(),
+                    exynosHdrDynamicInfo.data.maxscl[0])) {
         colorSettingChanged = true;
         for (uint32_t i = 0 ; i < layerColorData.dynamic_metadata.maxscl.size(); i++) {
-            layerColorData.dynamic_metadata.maxscl[i] =
-                exynosHdrDynamicInfo.data.maxscl[i];
+          layerColorData.dynamic_metadata.maxscl[i] = exynosHdrDynamicInfo.data.maxscl[0][i];
         }
     }
     static constexpr uint32_t DYNAMIC_META_DAT_SIZE = 15;
 
     updateInfoVectorVal(layerColorData.dynamic_metadata.maxrgb_percentages,
-            exynosHdrDynamicInfo.data.maxrgb_percentages,
-            DYNAMIC_META_DAT_SIZE);
+                        exynosHdrDynamicInfo.data.maxrgb_percentages[0], DYNAMIC_META_DAT_SIZE);
     updateInfoVectorVal(layerColorData.dynamic_metadata.maxrgb_percentiles,
-            exynosHdrDynamicInfo.data.maxrgb_percentiles,
-            DYNAMIC_META_DAT_SIZE);
+                        exynosHdrDynamicInfo.data.maxrgb_percentiles[0], DYNAMIC_META_DAT_SIZE);
     updateInfoSingleVal(layerColorData.dynamic_metadata.tm_flag,
-            exynosHdrDynamicInfo.data.tone_mapping.tone_mapping_flag);
+                        exynosHdrDynamicInfo.data.tone_mapping.tone_mapping_flag[0]);
     updateInfoSingleVal(layerColorData.dynamic_metadata.tm_knee_x,
-            exynosHdrDynamicInfo.data.tone_mapping.knee_point_x);
+                        exynosHdrDynamicInfo.data.tone_mapping.knee_point_x[0]);
     updateInfoSingleVal(layerColorData.dynamic_metadata.tm_knee_y,
-            exynosHdrDynamicInfo.data.tone_mapping.knee_point_y);
+                        exynosHdrDynamicInfo.data.tone_mapping.knee_point_y[0]);
     updateInfoVectorVal(layerColorData.dynamic_metadata.bezier_curve_anchors,
-            exynosHdrDynamicInfo.data.tone_mapping.bezier_curve_anchors,
-            DYNAMIC_META_DAT_SIZE);
+                        exynosHdrDynamicInfo.data.tone_mapping.bezier_curve_anchors[0],
+                        DYNAMIC_META_DAT_SIZE);
 }
 
 int32_t ExynosPrimaryDisplayModule::DisplaySceneInfo::setClientCompositionColorData(