Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 493942cd authored by Yue Hin Lau's avatar Yue Hin Lau Committed by Alex Deucher
Browse files

drm/amd/display: dpp clean up 



Signed-off-by: default avatarYue Hin Lau <Yuehin.Lau@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7bc6f1ca

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

+3 −1
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
#define FN(reg_name, field_name) \

	dpp->tf_shift->field_name, dpp->tf_mask->field_name



#define NUM_ELEMENTS(a) (sizeof(a) / sizeof((a)[0]))



struct dcn10_input_csc_matrix {

	enum dc_color_space color_space;

	uint16_t regval[12];
@@ -270,7 +272,7 @@ void dpp1_cm_set_output_csc_default( 
	struct dcn10_dpp *dpp = TO_DCN10_DPP(dpp_base);

	struct out_csc_color_matrix tbl_entry;

	int i, j;

	int arr_size = sizeof(output_csc_matrix) / sizeof(struct output_csc_matrix);

	int arr_size = NUM_ELEMENTS(output_csc_matrix);

	uint32_t ocsc_mode = 4;



	tbl_entry.color_space = colorspace;

drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h

+1 −6
Original line number Diff line number Diff line
@@ -131,12 +131,7 @@ struct out_csc_color_matrix { 
	uint16_t regval[12];

};



struct output_csc_matrix {

	enum dc_color_space color_space;

	uint16_t regval[12];

};



static const struct output_csc_matrix output_csc_matrix[] = {

static const struct out_csc_color_matrix output_csc_matrix[] = {

	{ COLOR_SPACE_SRGB,

		{ 0x2000, 0, 0, 0, 0, 0x2000, 0, 0, 0, 0, 0x2000, 0} },

	{ COLOR_SPACE_SRGB_LIMITED,