Commit 586f27a3 authored by Anthony Koo's avatar Anthony Koo Committed by Alex Deucher
Browse files

drm/amd/display: csc_transform to dc_csc_transform 



Signed-off-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Reviewed-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5c616116

drivers/gpu/drm/amd/display/dc/dc.h

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ struct dc_plane_state { 
	struct dc_gamma *gamma_correction;

	struct dc_transfer_func *in_transfer_func;

	struct dc_bias_and_scale *bias_and_scale;

	struct csc_transform input_csc_color_matrix;

	struct dc_csc_transform input_csc_color_matrix;

	struct fixed31_32 coeff_reduction_factor;

	uint32_t sdr_white_level;
@@ -522,7 +522,7 @@ struct dc_surface_update { 
	struct dc_gamma *gamma;

	struct dc_transfer_func *in_transfer_func;



	struct csc_transform *input_csc_color_matrix;

	struct dc_csc_transform *input_csc_color_matrix;

	struct fixed31_32 *coeff_reduction_factor;

};

drivers/gpu/drm/amd/display/dc/dc_hw_types.h

+5 −0
Original line number Diff line number Diff line
@@ -423,6 +423,11 @@ enum dc_gamma_type { 
	GAMMA_CS_TFM_1D = 3,

};



struct dc_csc_transform {

	uint16_t matrix[12];

	bool enable_adjustment;

};



struct dc_gamma {

	struct kref refcount;

	enum dc_gamma_type type;

drivers/gpu/drm/amd/display/dc/dc_stream.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct dc_stream_state { 
	struct dc_info_packet hdr_static_metadata;

	struct dc_transfer_func *out_transfer_func;

	struct colorspace_transform gamut_remap_matrix;

	struct csc_transform csc_color_matrix;

	struct dc_csc_transform csc_color_matrix;



	enum dc_color_space output_color_space;

	enum dc_dither_option dither_option;

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ void dpp1_cnv_setup ( 
		struct dpp *dpp_base,

		enum surface_pixel_format format,

		enum expansion_mode mode,

		struct csc_transform input_csc_color_matrix,

		struct dc_csc_transform input_csc_color_matrix,

		enum dc_color_space input_color_space)

{

	uint32_t pixel_format;

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h

+1 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ void dpp1_cnv_setup ( 
		struct dpp *dpp_base,

		enum surface_pixel_format format,

		enum expansion_mode mode,

		struct csc_transform input_csc_color_matrix,

		struct dc_csc_transform input_csc_color_matrix,

		enum dc_color_space input_color_space);



void dpp1_full_bypass(struct dpp *dpp_base);

CRA Git | Maintained and supported by SUSTech CRA and CCSE