Commit f432f006 authored by Wesley Chalmers's avatar Wesley Chalmers Committed by Alex Deucher
Browse files

drm/amd/display: Use dcn1 Optimal Taps Get 



[WHY]
dpp2_get_optimal_number_of_taps is incorrect, and dcn2 should be using
dpp1_get_optimal_number_of_taps instead

Signed-off-by: default avatarWesley Chalmers <Wesley.Chalmers@amd.com>
Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 82db2e3c

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

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ void dpp_set_gamut_remap_bypass(struct dcn10_dpp *dpp) 


#define IDENTITY_RATIO(ratio) (dc_fixpt_u2d19(ratio) == (1 << 19))



static bool dpp_get_optimal_number_of_taps(

bool dpp1_get_optimal_number_of_taps(

		struct dpp *dpp,

		struct scaler_data *scl_data,

		const struct scaling_taps *in_taps)
@@ -521,7 +521,7 @@ static const struct dpp_funcs dcn10_dpp_funcs = { 
		.dpp_read_state = dpp_read_state,

		.dpp_reset = dpp_reset,

		.dpp_set_scaler = dpp1_dscl_set_scaler_manual_scale,

		.dpp_get_optimal_number_of_taps = dpp_get_optimal_number_of_taps,

		.dpp_get_optimal_number_of_taps = dpp1_get_optimal_number_of_taps,

		.dpp_set_gamut_remap = dpp1_cm_set_gamut_remap,

		.dpp_set_csc_adjustment = dpp1_cm_set_output_csc_adjustment,

		.dpp_set_csc_default = dpp1_cm_set_output_csc_default,

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

+5 −0
Original line number Diff line number Diff line
@@ -1504,6 +1504,11 @@ void dpp1_set_hdr_multiplier( 
		struct dpp *dpp_base,

		uint32_t multiplier);



bool dpp1_get_optimal_number_of_taps(

		struct dpp *dpp,

		struct scaler_data *scl_data,

		const struct scaling_taps *in_taps);



void dpp1_construct(struct dcn10_dpp *dpp1,

	struct dc_context *ctx,

	uint32_t inst,

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

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static struct dpp_funcs dcn20_dpp_funcs = { 
	.dpp_read_state = dpp20_read_state,

	.dpp_reset = dpp_reset,

	.dpp_set_scaler = dpp1_dscl_set_scaler_manual_scale,

	.dpp_get_optimal_number_of_taps = dpp2_get_optimal_number_of_taps,

	.dpp_get_optimal_number_of_taps = dpp1_get_optimal_number_of_taps,

	.dpp_set_gamut_remap = dpp1_cm_set_gamut_remap,

	.dpp_set_csc_adjustment = NULL,

	.dpp_set_csc_default = NULL,

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

+0 −5
Original line number Diff line number Diff line
@@ -705,11 +705,6 @@ void dpp2_set_hdr_multiplier( 
		struct dpp *dpp_base,

		uint32_t multiplier);



bool dpp2_get_optimal_number_of_taps(

		struct dpp *dpp,

		struct scaler_data *scl_data,

		const struct scaling_taps *in_taps);



bool dpp2_construct(struct dcn20_dpp *dpp2,

	struct dc_context *ctx,

	uint32_t inst,

CRA Git | Maintained and supported by SUSTech CRA and CCSE