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

Commit 668440f6 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Greg Kroah-Hartman
Browse files

drm/amd/display: Use plane->color_space for dpp if specified 



[ Upstream commit a1e07ba89d49581471d64c48152dbe03b42bd025 ]

[Why]
The input color space for the plane was previously ignored even if it
was set.

If a limited range YUV format was given to DC then the
wrong color transformation matrix was being used since DC assumed that
it was full range instead.

[How]
Respect the given color_space format for the plane if it isn't
COLOR_SPACE_UNKNOWN. Otherwise, use the implicit default since DM
didn't specify.

Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: default avatarSun peng Li <Sunpeng.Li@amd.com>
Acked-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 671fc900

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

+5 −1
Original line number Diff line number Diff line
@@ -388,6 +388,10 @@ void dpp1_cnv_setup ( 
	default:

		break;

	}



	/* Set default color space based on format if none is given. */

	color_space = input_color_space ? input_color_space : color_space;



	REG_SET(CNVC_SURFACE_PIXEL_FORMAT, 0,

			CNVC_SURFACE_PIXEL_FORMAT, pixel_format);

	REG_UPDATE(FORMAT_CONTROL, FORMAT_CONTROL__ALPHA_EN, alpha_en);
@@ -399,7 +403,7 @@ void dpp1_cnv_setup ( 
		for (i = 0; i < 12; i++)

			tbl_entry.regval[i] = input_csc_color_matrix.matrix[i];



		tbl_entry.color_space = input_color_space;

		tbl_entry.color_space = color_space;



		if (color_space >= COLOR_SPACE_YCBCR601)

			select = INPUT_CSC_SELECT_ICSC;

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

+1 −1
Original line number Diff line number Diff line
@@ -1890,7 +1890,7 @@ static void update_dpp(struct dpp *dpp, struct dc_plane_state *plane_state) 
			plane_state->format,

			EXPANSION_MODE_ZERO,

			plane_state->input_csc_color_matrix,

			COLOR_SPACE_YCBCR601_LIMITED);

			plane_state->color_space);



	//set scale and bias registers

	build_prescale_params(&bns_params, plane_state);