From e313f8855a9a467da3aa982b046209df5cad4bcb Mon Sep 17 00:00:00 2001
From: Albert I <kras@raphielgang.org>
Date: Wed, 30 Jun 2021 19:06:09 +0800
Subject: [PATCH] sm6250-common: Set up display color compositions

* Switch to "Adaptive" mode and Display P3 color by default

* Use default color mode for Natural and Boosted

* Enable QDCM combined mode and disable factory mode

* Drop LiveDisplay's color mode support as it conflicts with AOSP display
  color adjustment

* Rest of configuration is kanged off Pixel's overlay

Signed-off-by: Albert I <kras@raphielgang.org>
Change-Id: Ib26033fe00a6cc1e8c7d8f93da417516e31a52e3
---
 device_framework_matrix.xml                   |  4 ---
 manifest.xml                                  |  1 -
 .../base/core/res/res/values/config.xml       | 34 +++++++++++++++++++
 vendor.prop                                   |  6 ++--
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
index 83bf2f1..9834176 100644
--- a/device_framework_matrix.xml
+++ b/device_framework_matrix.xml
@@ -95,10 +95,6 @@
         <name>vendor.lineage.livedisplay</name>
         <version>2.0</version>
         <interface>
-            <name>IDisplayModes</name>
-            <instance>default</instance>
-        </interface>
-	<interface>
             <name>IPictureAdjustment</name>
             <instance>default</instance>
         </interface>
diff --git a/manifest.xml b/manifest.xml
index 0c2c267..12fb24a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -139,7 +139,6 @@
     <hal format="hidl">
         <name>vendor.lineage.livedisplay</name>
         <transport>hwbinder</transport>
-        <fqname>@2.0::IDisplayModes/default</fqname>
         <fqname>@2.0::IPictureAdjustment/default</fqname>
     </hal>
     <hal format="hidl">
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1eb8f2d..565acba 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -327,4 +327,38 @@
          running in WAL mode.
          Choices are: FULL, NORMAL, OFF. -->
     <string name="db_wal_sync_mode" translatable="false">OFF</string>
+
+    <!-- Indicate available ColorDisplayManager.COLOR_MODE_xxx. -->
+    <integer-array name="config_availableColorModes">
+        <item>0</item> <!-- COLOR_MODE_NATURAL   -->
+        <item>1</item> <!-- COLOR_MODE_BOOSTED   -->
+        <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
+    </integer-array>
+
+    <!-- Color mode to use when accessibility transforms are enabled. This color mode must be
+         supported by the device, but not necessarily appear in config_availableColorModes. The
+         regularly selected color mode will be used if this value is negative. -->
+    <integer name="config_accessibilityColorMode">2</integer>
+
+    <!-- The following two arrays specify which color space to use for display composition when a
+         certain color mode is active.
+         Composition color spaces are defined in android.view.Display.COLOR_MODE_xxx, and color
+         modes are defined in ColorDisplayManager.COLOR_MODE_xxx and
+         ColorDisplayManager.VENDOR_COLOR_MODE_xxx.
+         The color space COLOR_MODE_DEFAULT (0) lets the system select the most appropriate
+         composition color space for currently displayed content. Other values (e.g.,
+         COLOR_MODE_SRGB) override system selection; these other color spaces must be supported by
+         the device for for display composition.
+         If a color mode does not have a corresponding color space specified in this array, the
+         currently set composition color space will not be modified.-->
+    <integer-array name="config_displayCompositionColorModes">
+        <item>0</item> <!-- COLOR_MODE_NATURAL   -->
+        <item>1</item> <!-- COLOR_MODE_BOOSTED   -->
+        <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
+    </integer-array>
+    <integer-array name="config_displayCompositionColorSpaces">
+        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
+        <item>0</item> <!-- COLOR_MODE_DEFAULT    -->
+        <item>9</item> <!-- COLOR_MODE_DISPLAY_P3 -->
+    </integer-array>
 </resources>
diff --git a/vendor.prop b/vendor.prop
index 19d7e2b..0dd88bd 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -133,6 +133,8 @@ vendor.display.disable_ui_3d_tonemap=1
 vendor.display.enable_default_color_mode=0
 vendor.display.enable_null_display=0
 vendor.display.enable_optimize_refresh=1
+vendor.display.qdcm.disable_factory_mode=1
+vendor.display.qdcm.mode_combine=1
 vendor.display.svi.config=1
 vendor.display.svi.config_path=/vendor/etc/SVIConfig.xml
 
@@ -147,9 +149,9 @@ debug.egl.hw=0
 debug.mdpcomp.logs=0
 debug.sf.hw=0
 debug.sf.latch_unsignaled=1
-persist.sys.sf.color_mode=0
+persist.sys.sf.color_mode=9
 persist.sys.sf.color_saturation=1.0
-persist.sys.sf.native_mode=0
+persist.sys.sf.native_mode=2
 ro.hardware.egl=adreno
 ro.hardware.vulkan=adreno
 ro.opengles.version=196610