[Intel-gfx] [PATCH 21/24] drm/i915: Ensure color blobs are copied to slave before planes are checked

[Maarten Lankhorst]

This is required to ensure property blobs are correctly copied on bigjoiner
slaves. Only at this point we are sure that the slave crtc is part of the state.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 66d7eaedcea3..0d9d4e2d61c6 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -11935,6 +11935,16 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)
 
 			if (IS_ERR(linked_crtc_state))
 				return PTR_ERR(linked_crtc_state);
+
+			if (needs_modeset(new_crtc_state) || new_crtc_state->update_pipe ||
+			    new_crtc_state->uapi.color_mgmt_changed) {
+				if (new_crtc_state->bigjoiner_slave)
+					intel_crtc_copy_color_blobs(new_crtc_state,
+								    linked_crtc_state);
+				else
+					intel_crtc_copy_color_blobs(linked_crtc_state,
+								    new_crtc_state);
+			}
 		}
 	}
 
-- 
2.23.0