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

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Mon Oct 7 13:39:52 UTC 2019


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 1e9a6fd01606..82e38a5d2e99 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -11923,6 +11923,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



More information about the Intel-gfx-trybot mailing list