Commit 02a940da authored by Yihan Zhu's avatar Yihan Zhu Committed by Alex Deucher
Browse files

drm/amd/display: handle max_downscale_src_width fail check 



[WHY]
If max_downscale_src_width check fails, we exit early from TAP calculation and left a NULL
value to the scaling data structure to cause the zero divide in the DML validation.

[HOW]
Call set default TAP calculation before early exit in get_optimal_number_of_taps due to
max downscale limit exceed.

Reviewed-by: default avatarSamson Tam <samson.tam@amd.com>
Signed-off-by: default avatarYihan Zhu <Yihan.Zhu@amd.com>
Signed-off-by: default avatarZaeem Mohamed <zaeem.mohamed@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7c6518c1

drivers/gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c

+6 −5
Original line number Diff line number Diff line
@@ -425,11 +425,6 @@ bool dpp3_get_optimal_number_of_taps( 
	int min_taps_y, min_taps_c;

	enum lb_memory_config lb_config;



	if (scl_data->viewport.width > scl_data->h_active &&

		dpp->ctx->dc->debug.max_downscale_src_width != 0 &&

		scl_data->viewport.width > dpp->ctx->dc->debug.max_downscale_src_width)

		return false;



	/*

	 * Set default taps if none are provided

	 * From programming guide: taps = min{ ceil(2*H_RATIO,1), 8} for downscaling
@@ -467,6 +462,12 @@ bool dpp3_get_optimal_number_of_taps( 
	else

		scl_data->taps.h_taps_c = in_taps->h_taps_c;



	// Avoid null data in the scl data with this early return, proceed non-adaptive calcualtion first

	if (scl_data->viewport.width > scl_data->h_active &&

		dpp->ctx->dc->debug.max_downscale_src_width != 0 &&

		scl_data->viewport.width > dpp->ctx->dc->debug.max_downscale_src_width)

		return false;



	/*Ensure we can support the requested number of vtaps*/

	min_taps_y = dc_fixpt_ceil(scl_data->ratios.vert);

	min_taps_c = dc_fixpt_ceil(scl_data->ratios.vert_c);