[PATCH 13/23] drm/i915/color: Add framework to program CSC

Chaitanya Kumar Borah chaitanya.kumar.borah at intel.com
Fri Jun 6 05:23:36 UTC 2025


Add framework to program CSC. It enables copying of matrix from uapi
to intel plane state. Also adding helper functions which will eventually
program values to hardware.

Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah at intel.com>
---
 .../gpu/drm/i915/display/intel_atomic_plane.c | 39 +++++++++++++++++++
 drivers/gpu/drm/i915/display/intel_color.c    | 12 ++++++
 drivers/gpu/drm/i915/display/intel_color.h    |  3 +-
 .../drm/i915/display/intel_display_types.h    |  1 +
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 15ede7678636..78c94a5f96fe 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -374,6 +374,43 @@ intel_plane_copy_uapi_plane_damage(struct intel_plane_state *new_plane_state,
 		*damage = drm_plane_state_src(&new_uapi_plane_state->uapi);
 }
 
+static void
+intel_plane_colorop_replace_blob(struct intel_plane_state *plane_state,
+				 struct intel_plane_colorop *intel_colorop,
+				 struct drm_property_blob *blob)
+{
+	if (intel_colorop->id == CB_PLANE_CSC)
+		drm_property_replace_blob(&plane_state->hw.ctm, blob);
+}
+
+static void
+intel_plane_copy_uapi_to_hw_state_color(struct intel_plane_state *plane_state,
+					const struct intel_plane_state *from_plane_state,
+					struct intel_crtc *crtc)
+{
+	struct drm_colorop *iter_colorop, *colorop;
+	struct drm_colorop_state *new_colorop_state;
+	struct drm_atomic_state *state = plane_state->uapi.state;
+	struct intel_plane_colorop *intel_colorop;
+	struct drm_property_blob *blob;
+	int i = 0;
+
+	iter_colorop = plane_state->uapi.color_pipeline;
+
+	while (iter_colorop) {
+		for_each_new_colorop_in_state(state, colorop, new_colorop_state, i) {
+			if (new_colorop_state->colorop == iter_colorop) {
+				blob = new_colorop_state->bypass ? NULL : new_colorop_state->data;
+				intel_colorop = to_intel_plane_colorop(colorop);
+				intel_plane_colorop_replace_blob(plane_state,
+								 intel_colorop,
+								 blob);
+			}
+		}
+		iter_colorop = iter_colorop->next;
+	}
+}
+
 void intel_plane_copy_uapi_to_hw_state(struct intel_plane_state *plane_state,
 				       const struct intel_plane_state *from_plane_state,
 				       struct intel_crtc *crtc)
@@ -402,6 +439,8 @@ void intel_plane_copy_uapi_to_hw_state(struct intel_plane_state *plane_state,
 
 	plane_state->uapi.src = drm_plane_state_src(&from_plane_state->uapi);
 	plane_state->uapi.dst = drm_plane_state_dest(&from_plane_state->uapi);
+
+	intel_plane_copy_uapi_to_hw_state_color(plane_state, from_plane_state, crtc);
 }
 
 void intel_plane_copy_hw_state(struct intel_plane_state *plane_state,
diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index aa0ace28df0b..2f5e4f7c8eb3 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -4097,6 +4097,18 @@ static const struct drm_color_lut_range xelpd_gamma_hdr[] = {
 };
 
 /* TODO: Move to another file */
+static void
+intel_color_load_plane_csc_matrix(const struct intel_plane_state *plane_state)
+{
+	/* CTM programming */
+}
+
+void intel_color_plane_program_pipeline(const struct intel_plane_state *plane_state)
+{
+	if (plane_state->hw.ctm)
+		intel_color_load_plane_csc_matrix(plane_state);
+}
+
 struct intel_plane_colorop *intel_colorop_alloc(void)
 {
 	struct intel_plane_colorop *colorop;
diff --git a/drivers/gpu/drm/i915/display/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
index c2561b86bb26..bbdfe47143b3 100644
--- a/drivers/gpu/drm/i915/display/intel_color.h
+++ b/drivers/gpu/drm/i915/display/intel_color.h
@@ -13,6 +13,7 @@ struct intel_crtc_state;
 struct intel_crtc;
 struct intel_display;
 struct intel_dsb;
+struct intel_plane_state;
 struct drm_property_blob;
 struct drm_plane;
 struct drm_prop_enum_list;
@@ -49,5 +50,5 @@ struct intel_plane_colorop *intel_colorop_alloc(void);
 struct intel_plane_colorop *intel_plane_colorop_create(enum intel_color_block id);
 int intel_plane_tf_pipeline_init(struct drm_plane *plane, struct drm_prop_enum_list *list);
 int intel_plane_color_init(struct drm_plane *plane);
-
+void intel_color_plane_program_pipeline(const struct intel_plane_state *plane_state);
 #endif /* __INTEL_COLOR_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index ccfaa5ab1e53..9ab496c175df 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -628,6 +628,7 @@ struct intel_plane_state {
 		enum drm_color_encoding color_encoding;
 		enum drm_color_range color_range;
 		enum drm_scaling_filter scaling_filter;
+		struct drm_property_blob *ctm;
 	} hw;
 
 	struct i915_vma *ggtt_vma;
-- 
2.25.1



More information about the Intel-gfx-trybot mailing list