Commit a78f1b6b authored by Chaitanya Kumar Borah's avatar Chaitanya Kumar Borah Committed by Jani Nikula
Browse files

drm/i915/color: Add framework to program CSC 



Add framework to program CSC. It enables copying of matrix from UAPI
to intel plane state. Also add helper functions which will eventually
program values 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)

v3:
- align parameters with open braces (Suraj)
- Improve commit message (Suraj)

v4:
- Re-arrange variable declaration (Suraj)

Reviewed-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Link: https://patch.msgid.link/20251203085211.3663374-6-uma.shankar@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent ef105316

drivers/gpu/drm/i915/display/intel_color.c

+21 −0
Original line number Diff line number Diff line
@@ -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)
@@ -3963,6 +3967,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);

drivers/gpu/drm/i915/display/intel_color.h

+3 −1
Original line number Diff line number Diff line
@@ -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__ */

drivers/gpu/drm/i915/display/intel_display_types.h

+4 −0
Original line number Diff line number Diff line
@@ -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;
@@ -1391,6 +1392,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 {

drivers/gpu/drm/i915/display/intel_plane.c

+49 −0
Original line number Diff line number Diff line
@@ -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;

	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;

	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_colorop(colorop);

				changed |= intel_plane_colorop_replace_blob(plane_state,

									    intel_colorop,

									    blob);

			}

		}

		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,