Commit 6566cae7 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: fix odm scaling 



There are two issues with scaling calculations, odm recout
calculation and matching viewport to actual recout.

This change fixes both issues. Odm recout calculation via
special casing and viewport matching issue by reworking
the viewport calcualtion to use scaling ratios and recout
to derrive the required offset and size.

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 998b7ad2

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+201 −367

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −5
Original line number Diff line number Diff line
@@ -271,11 +271,6 @@ struct dc_edid_caps { 
	struct dc_panel_patch panel_patch;

};



struct view {

	uint32_t width;

	uint32_t height;

};



struct dc_mode_flags {

	/* note: part of refresh rate flag*/

	uint32_t INTERLACE :1;

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

+8 −4
Original line number Diff line number Diff line
@@ -631,8 +631,10 @@ static void dpp1_dscl_set_manual_ratio_init( 
		SCL_V_INIT_INT, init_int);



	if (REG(SCL_VERT_FILTER_INIT_BOT)) {

		init_frac = dc_fixpt_u0d19(data->inits.v_bot) << 5;

		init_int = dc_fixpt_floor(data->inits.v_bot);

		struct fixed31_32 bot = dc_fixpt_add(data->inits.v, data->ratios.vert);



		init_frac = dc_fixpt_u0d19(bot) << 5;

		init_int = dc_fixpt_floor(bot);

		REG_SET_2(SCL_VERT_FILTER_INIT_BOT, 0,

			SCL_V_INIT_FRAC_BOT, init_frac,

			SCL_V_INIT_INT_BOT, init_int);
@@ -645,8 +647,10 @@ static void dpp1_dscl_set_manual_ratio_init( 
		SCL_V_INIT_INT_C, init_int);



	if (REG(SCL_VERT_FILTER_INIT_BOT_C)) {

		init_frac = dc_fixpt_u0d19(data->inits.v_c_bot) << 5;

		init_int = dc_fixpt_floor(data->inits.v_c_bot);

		struct fixed31_32 bot = dc_fixpt_add(data->inits.v_c, data->ratios.vert_c);



		init_frac = dc_fixpt_u0d19(bot) << 5;

		init_int = dc_fixpt_floor(bot);

		REG_SET_2(SCL_VERT_FILTER_INIT_BOT_C, 0,

			SCL_V_INIT_FRAC_BOT_C, init_frac,

			SCL_V_INIT_INT_BOT_C, init_int);

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+8 −6
Original line number Diff line number Diff line
@@ -2289,12 +2289,14 @@ int dcn20_populate_dml_pipes_from_context( 


			pipes[pipe_cnt].pipe.src.source_scan = pln->rotation == ROTATION_ANGLE_90

					|| pln->rotation == ROTATION_ANGLE_270 ? dm_vert : dm_horz;

			pipes[pipe_cnt].pipe.src.viewport_y_y = scl->viewport_unadjusted.y;

			pipes[pipe_cnt].pipe.src.viewport_y_c = scl->viewport_c_unadjusted.y;

			pipes[pipe_cnt].pipe.src.viewport_width = scl->viewport_unadjusted.width;

			pipes[pipe_cnt].pipe.src.viewport_width_c = scl->viewport_c_unadjusted.width;

			pipes[pipe_cnt].pipe.src.viewport_height = scl->viewport_unadjusted.height;

			pipes[pipe_cnt].pipe.src.viewport_height_c = scl->viewport_c_unadjusted.height;

			pipes[pipe_cnt].pipe.src.viewport_y_y = scl->viewport.y;

			pipes[pipe_cnt].pipe.src.viewport_y_c = scl->viewport_c.y;

			pipes[pipe_cnt].pipe.src.viewport_width = scl->viewport.width;

			pipes[pipe_cnt].pipe.src.viewport_width_c = scl->viewport_c.width;

			pipes[pipe_cnt].pipe.src.viewport_height = scl->viewport.height;

			pipes[pipe_cnt].pipe.src.viewport_height_c = scl->viewport_c.height;

			pipes[pipe_cnt].pipe.src.viewport_width_max = pln->src_rect.width;

			pipes[pipe_cnt].pipe.src.viewport_height_max = pln->src_rect.height;

			pipes[pipe_cnt].pipe.src.surface_width_y = pln->plane_size.surface_size.width;

			pipes[pipe_cnt].pipe.src.surface_height_y = pln->plane_size.surface_size.height;

			pipes[pipe_cnt].pipe.src.surface_width_c = pln->plane_size.chroma_size.width;

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

+2 −0
Original line number Diff line number Diff line
@@ -253,6 +253,8 @@ struct _vcs_dpi_display_pipe_source_params_st { 
	unsigned int viewport_y_c;

	unsigned int viewport_width_c;

	unsigned int viewport_height_c;

	unsigned int viewport_width_max;

	unsigned int viewport_height_max;

	unsigned int data_pitch;

	unsigned int data_pitch_c;

	unsigned int meta_pitch;