From c230a8101ecd6d689c2bf2d143e9eff525566384 Mon Sep 17 00:00:00 2001
From: Joen Chen <joenchen@google.com>
Date: Wed, 31 Jan 2024 14:40:01 +0000
Subject: [PATCH 1/2] zuma: enable dynamic color mode

Enable dynamic color mode to reduce the power overhead of color space
conversion when GPU composition exists.

Bug: 315787778
Test: check "dumpsys SurfaceFlinger" and state of display color service
when playing SDR/HDR video

Change-Id: Ie9e87091385ab5247141bf956fbaba3275cc6811
---
 device.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/device.mk b/device.mk
index 5a2e3763..51967b42 100644
--- a/device.mk
+++ b/device.mk
@@ -709,10 +709,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=tr
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.display_update_imminent_timeout_ms=50
 
-# force to blend in P3 mode
 PRODUCT_PROPERTY_OVERRIDES += \
-	persist.sys.sf.native_mode=2 \
-	persist.sys.sf.color_mode=9
+	persist.sys.sf.native_mode=2
 PRODUCT_COPY_FILES += \
 	device/google/zuma/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb \
 	device/google/zuma/display/display_colordata_cal2.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal2.pb

From c249f683d0bfd4485e01953ce5151cdf5baeb0e5 Mon Sep 17 00:00:00 2001
From: PODISHETTY KUMAR <podishettyk@google.com>
Date: Mon, 5 Feb 2024 06:16:03 +0000
Subject: [PATCH 2/2] Revert "zuma: enable dynamic color mode"

This reverts commit c230a8101ecd6d689c2bf2d143e9eff525566384.

Reason for revert: <Reason for revert: Potential culprit for b/323784378  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: I27666c2a0a04a1f93863360aa689a5aad740d0cc
---
 device.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 51967b42..5a2e3763 100644
--- a/device.mk
+++ b/device.mk
@@ -709,8 +709,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=tr
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.display_update_imminent_timeout_ms=50
 
+# force to blend in P3 mode
 PRODUCT_PROPERTY_OVERRIDES += \
-	persist.sys.sf.native_mode=2
+	persist.sys.sf.native_mode=2 \
+	persist.sys.sf.color_mode=9
 PRODUCT_COPY_FILES += \
 	device/google/zuma/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb \
 	device/google/zuma/display/display_colordata_cal2.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal2.pb