hwc2: Cache color mode and render intent for Primary display
Cache the color mode and render intent for Primary display, so that
the current color mode and intent can be applied in Validate phase.
CRs-Fixed: 2307970
Change-Id: I2944d1b20d5dd9b127a22559b20cfcd56bf2c1ad
diff --git a/sdm/libs/hwc2/hwc_display_builtin.cpp b/sdm/libs/hwc2/hwc_display_builtin.cpp
index cc02ad6..7d5b5e1 100644
--- a/sdm/libs/hwc2/hwc_display_builtin.cpp
+++ b/sdm/libs/hwc2/hwc_display_builtin.cpp
@@ -195,6 +195,12 @@
// Checks and replaces layer stack for solid fill
SolidFillPrepare();
+ // Apply current Color Mode and Render Intent.
+ if (color_mode_->ApplyCurrentColorModeWithRenderIntent() != HWC2::Error::None) {
+ // Fallback to GPU Composition, if Color Mode can't be applied.
+ MarkLayersForClientComposition();
+ }
+
bool pending_output_dump = dump_frame_count_ && dump_output_to_file_;
if (readback_buffer_queued_ || pending_output_dump) {
@@ -279,7 +285,7 @@
}
HWC2::Error HWCDisplayBuiltIn::SetColorModeWithRenderIntent(ColorMode mode, RenderIntent intent) {
- auto status = color_mode_->SetColorModeWithRenderIntent(mode, intent);
+ auto status = color_mode_->CacheColorModeWithRenderIntent(mode, intent);
if (status != HWC2::Error::None) {
DLOGE("failed for mode = %d intent = %d", mode, intent);
return status;