> -----Original Message----- > From: Borah, Chaitanya Kumar <[email protected]> > Sent: Tuesday, November 18, 2025 2:23 PM > To: Kandpal, Suraj <[email protected]>; Shankar, Uma > <[email protected]>; [email protected]; intel- > [email protected]; [email protected] > Cc: [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; > [email protected]; Sharma, Swati2 <[email protected]>; > [email protected]; Nikula, Jani <[email protected]> > Subject: Re: [v6 06/16] drm/i915/color: Add framework to program CSC > > > > On 11/18/2025 1:54 PM, Kandpal, Suraj wrote: > >> Subject: [v6 06/16] drm/i915/color: Add framework to program CSC > >> > >> From: Chaitanya Kumar Borah <[email protected]> > >> > >> Add framework to program CSC. It enables copying of matrix from uapi > >> to intel > > > > *UAPI > > > >> plane state. Also adding helper functions which will eventually > >> program values > > > > *add > > > > Ack. > > >> to hardware. > >> > >> Add a crtc state variable to track plane color change. > >> > >> v2: > >> - Add crtc_state->plane_color_changed > >> - Improve comments (Suraj) > >> - s/intel_plane_*_color/intel_plane_color_* (Suraj) > >> > >> Signed-off-by: Chaitanya Kumar Borah > >> <[email protected]> > >> Signed-off-by: Uma Shankar <[email protected]> > >> --- > >> drivers/gpu/drm/i915/display/intel_color.c | 21 ++++++++ > >> drivers/gpu/drm/i915/display/intel_color.h | 4 +- > >> .../drm/i915/display/intel_display_types.h | 4 ++ > >> drivers/gpu/drm/i915/display/intel_plane.c | 49 > +++++++++++++++++++ > >> 4 files changed, 77 insertions(+), 1 deletion(-) > >> > >> diff --git a/drivers/gpu/drm/i915/display/intel_color.c > >> b/drivers/gpu/drm/i915/display/intel_color.c > >> index 1e97020e7304..a45d348c9851 100644 > >> --- a/drivers/gpu/drm/i915/display/intel_color.c > >> +++ b/drivers/gpu/drm/i915/display/intel_color.c > >> @@ -87,6 +87,10 @@ struct intel_color_funcs { > >> * Read config other than LUTs and CSCs, before them. Optional. > >> */ > >> void (*get_config)(struct intel_crtc_state *crtc_state); > >> + > >> + /* Plane CSC*/ > >> + void (*load_plane_csc_matrix)(struct intel_dsb *dsb, > >> + const struct intel_plane_state > >> *plane_state); > >> }; > >> > >> #define CTM_COEFF_SIGN (1ULL << 63) > >> @@ -3962,6 +3966,23 @@ static const struct intel_color_funcs > >> ilk_color_funcs = { > >> .get_config = ilk_get_config, > >> }; > >> > >> +static void > >> +intel_color_load_plane_csc_matrix(struct intel_dsb *dsb, > >> + const struct intel_plane_state *plane_state) > >> { > >> + struct intel_display *display = to_intel_display(plane_state); > >> + > >> + if (display->funcs.color->load_plane_csc_matrix) > >> + display->funcs.color->load_plane_csc_matrix(dsb, > >> plane_state); } > >> + > >> +void intel_color_plane_program_pipeline(struct intel_dsb *dsb, > >> + const struct intel_plane_state > >> *plane_state) { > >> + if (plane_state->hw.ctm) > >> + intel_color_load_plane_csc_matrix(dsb, plane_state); } > >> + > >> void intel_color_crtc_init(struct intel_crtc *crtc) { > >> struct intel_display *display = to_intel_display(crtc); diff --git > >> a/drivers/gpu/drm/i915/display/intel_color.h > >> b/drivers/gpu/drm/i915/display/intel_color.h > >> index bf7a12ce9df0..8051c827a1d8 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; > >> > >> void intel_color_init_hooks(struct intel_display *display); @@ > >> -40,5 +41,6 @@ bool intel_color_lut_equal(const struct intel_crtc_state > *crtc_state, > >> const struct drm_property_blob *blob2, > >> bool is_pre_csc_lut); > >> void intel_color_assert_luts(const struct intel_crtc_state > >> *crtc_state); > >> - > >> +void intel_color_plane_program_pipeline(struct intel_dsb *dsb, > >> + 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 fa39f3236597..d25f90ded71f 100644 > >> --- a/drivers/gpu/drm/i915/display/intel_display_types.h > >> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > >> @@ -646,6 +646,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; > >> @@ -1392,6 +1393,9 @@ struct intel_crtc_state { > >> u8 silence_period_sym_clocks; > >> u8 lfps_half_cycle_num_of_syms; > >> } alpm_state; > >> + > >> + /* to track changes in plane color blocks */ > >> + bool plane_color_changed; > >> }; > >> > >> enum intel_pipe_crc_source { > >> diff --git a/drivers/gpu/drm/i915/display/intel_plane.c > >> b/drivers/gpu/drm/i915/display/intel_plane.c > >> index 505c776c0585..a5d0f95a6f10 100644 > >> --- a/drivers/gpu/drm/i915/display/intel_plane.c > >> +++ b/drivers/gpu/drm/i915/display/intel_plane.c > >> @@ -49,6 +49,7 @@ > >> #include "i9xx_plane_regs.h" > >> #include "intel_cdclk.h" > >> #include "intel_cursor.h" > >> +#include "intel_colorop.h" > >> #include "intel_display_rps.h" > >> #include "intel_display_trace.h" > >> #include "intel_display_types.h" > >> @@ -336,6 +337,52 @@ intel_plane_copy_uapi_plane_damage(struct > >> intel_plane_state *new_plane_state, > >> *damage = drm_plane_state_src(&new_uapi_plane_state- > >>> uapi); > >> } > >> > >> +static bool > >> +intel_plane_colorop_replace_blob(struct intel_plane_state *plane_state, > >> + struct intel_colorop *intel_colorop, > >> + struct drm_property_blob *blob) { > >> + if (intel_colorop->id == INTEL_PLANE_CB_CSC) > >> + return drm_property_replace_blob(&plane_state->hw.ctm, > >> blob); > >> + > >> + return false; > >> +} > >> + > >> +static void > >> +intel_plane_color_copy_uapi_to_hw_state(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_colorop *intel_colorop; > >> + struct drm_property_blob *blob; > >> + int i = 0; > >> + struct intel_atomic_state *intel_atomic_state = > >> to_intel_atomic_state(state); > >> + struct intel_crtc_state *new_crtc_state = intel_atomic_state ? > >> + intel_atomic_get_new_crtc_state(intel_atomic_state, crtc) : > >> NULL; > >> + bool changed = false; > >> + > >> + 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_colorop(colorop); > >> + changed |= > >> intel_plane_colorop_replace_blob(plane_state, > >> + > >> intel_colorop, > >> + blob); > > > > These params need to be aligned with open braces. > > Ack. > > > Also I noticed a lot of checkpatch errors that can be resolved please > > run checkpatch --strict Resolve all of them then send the patches unless the > warning or check is just unavoidable. > > > > Anything you are particularly referring to in this patch? > Most of the warnings are from the squashed patch. > And then there are the register addition patches from where we should be > able to fix the leading spaces ones. Will fix them in the next version.
No not this patch but ones with your register definitions I get some macros cannot be resolved without breaking Other compliances but we need to make sure not checkpatch errors are coming up specially the trailing and leading spaces Regards, Suraj Kandpal > > == > Chaitanya > > > Regards, > > Suraj Kandpal > > > >> + } > >> + } > >> + iter_colorop = iter_colorop->next; > >> + } > >> + > >> + if (new_crtc_state && changed) > >> + new_crtc_state->plane_color_changed = true; } > >> + > >> 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) @@ -364,6 +411,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_color_copy_uapi_to_hw_state(plane_state, > >> from_plane_state, > >> +crtc); > >> } > >> > >> void intel_plane_copy_hw_state(struct intel_plane_state > >> *plane_state, > >> -- > >> 2.50.1 > >
