Merge "sf: Reset dataspace for FBT when color mode changes from previous cycle" into s-keystone-qcom-dev

2 files changed, 12 insertions, 1 deletions

diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h
index e3558cd3e5..9e1abf0fd1 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h
@@ -93,6 +93,8 @@ private:
     composer::DisplayExtnIntf *mDisplayExtnIntf = nullptr;
     void beginDraw();
     void endDraw();
+    ColorProfile mColorProfile = {ui::ColorMode::NATIVE, ui::Dataspace::UNKNOWN,
+                                  ui::RenderIntent::COLORIMETRIC, ui::Dataspace::UNKNOWN};
 };
 
 // This template factory function standardizes the implementation details of the
diff --git a/services/surfaceflinger/CompositionEngine/src/Display.cpp b/services/surfaceflinger/CompositionEngine/src/Display.cpp
index 0a30928947..4850e2893e 100644
--- a/services/surfaceflinger/CompositionEngine/src/Display.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Display.cpp
@@ -146,7 +146,16 @@ void Display::setColorProfile(const ColorProfile& colorProfile) {
     const auto physicalId = PhysicalDisplayId::tryCast(mId);
     LOG_FATAL_IF(!physicalId);
 
-    mIsColorModeChanged = true;
+    if (colorProfile.mode != mColorProfile.mode ||
+        colorProfile.dataspace != mColorProfile.dataspace ||
+        colorProfile.renderIntent != mColorProfile.renderIntent) {
+        mIsColorModeChanged = true;
+    }
+
+    mColorProfile.mode = colorProfile.mode;
+    mColorProfile.dataspace = colorProfile.dataspace;
+    mColorProfile.renderIntent = colorProfile.renderIntent;
+    mColorProfile.colorSpaceAgnosticDataspace = colorProfile.colorSpaceAgnosticDataspace;
 
     getCompositionEngine().getHwComposer().setActiveColorMode(*physicalId, colorProfile.mode,
                                                               colorProfile.renderIntent);