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

Commit 0b19fdc4 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: fix dscl_manual_ratio_init 



This change will fix wb and display scaling when ratios of
4 or more are involved

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@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 df099b9b

drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c

+5 −0
Original line number Diff line number Diff line
@@ -449,6 +449,11 @@ static inline unsigned int clamp_ux_dy( 
		return min_clamp;

}



unsigned int dc_fixpt_u3d19(struct fixed31_32 arg)

{

	return ux_dy(arg.value, 3, 19);

}



unsigned int dc_fixpt_u2d19(struct fixed31_32 arg)

{

	return ux_dy(arg.value, 2, 19);

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

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


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





bool dpp_get_optimal_number_of_taps(

static bool dpp_get_optimal_number_of_taps(

		struct dpp *dpp,

		struct scaler_data *scl_data,

		const struct scaling_taps *in_taps)

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

+1 −5
Original line number Diff line number Diff line
@@ -1426,10 +1426,6 @@ void dpp1_set_degamma( 
void dpp1_set_degamma_pwl(struct dpp *dpp_base,

		const struct pwl_params *params);



bool dpp_get_optimal_number_of_taps(

		struct dpp *dpp,

		struct scaler_data *scl_data,

		const struct scaling_taps *in_taps);



void dpp_read_state(struct dpp *dpp_base,

		struct dcn_dpp_state *s);

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

+4 −4
Original line number Diff line number Diff line
@@ -565,16 +565,16 @@ static void dpp1_dscl_set_manual_ratio_init( 
	uint32_t init_int = 0;



	REG_SET(SCL_HORZ_FILTER_SCALE_RATIO, 0,

			SCL_H_SCALE_RATIO, dc_fixpt_u2d19(data->ratios.horz) << 5);

			SCL_H_SCALE_RATIO, dc_fixpt_u3d19(data->ratios.horz) << 5);



	REG_SET(SCL_VERT_FILTER_SCALE_RATIO, 0,

			SCL_V_SCALE_RATIO, dc_fixpt_u2d19(data->ratios.vert) << 5);

			SCL_V_SCALE_RATIO, dc_fixpt_u3d19(data->ratios.vert) << 5);



	REG_SET(SCL_HORZ_FILTER_SCALE_RATIO_C, 0,

			SCL_H_SCALE_RATIO_C, dc_fixpt_u2d19(data->ratios.horz_c) << 5);

			SCL_H_SCALE_RATIO_C, dc_fixpt_u3d19(data->ratios.horz_c) << 5);



	REG_SET(SCL_VERT_FILTER_SCALE_RATIO_C, 0,

			SCL_V_SCALE_RATIO_C, dc_fixpt_u2d19(data->ratios.vert_c) << 5);

			SCL_V_SCALE_RATIO_C, dc_fixpt_u3d19(data->ratios.vert_c) << 5);



	/*

	 * 0.24 format for fraction, first five bits zeroed

drivers/gpu/drm/amd/display/include/fixed31_32.h

+2 −0
Original line number Diff line number Diff line
@@ -496,6 +496,8 @@ static inline int dc_fixpt_ceil(struct fixed31_32 arg) 
 * fractional

 */



unsigned int dc_fixpt_u3d19(struct fixed31_32 arg);



unsigned int dc_fixpt_u2d19(struct fixed31_32 arg);



unsigned int dc_fixpt_u0d19(struct fixed31_32 arg);