diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4553-drm-amd-display-fix-dscl_manual_ratio_init.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4553-drm-amd-display-fix-dscl_manual_ratio_init.patch | 108 |
1 files changed, 108 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4553-drm-amd-display-fix-dscl_manual_ratio_init.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4553-drm-amd-display-fix-dscl_manual_ratio_init.patch new file mode 100644 index 00000000..cb2b7fd8 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4553-drm-amd-display-fix-dscl_manual_ratio_init.patch @@ -0,0 +1,108 @@ +From fd46b92701f0121bf0d504c58c9d9a61b8d92322 Mon Sep 17 00:00:00 2001 +From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> +Date: Thu, 17 May 2018 10:08:10 -0400 +Subject: [PATCH 4553/5725] 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: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +--- + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 5 +++++ + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 3 +-- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 6 +----- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 8 ++++---- + drivers/gpu/drm/amd/display/include/fixed31_32.h | 2 ++ + 5 files changed, 13 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c b/drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c +index e61dd97d..f289898 100644 +--- a/drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c ++++ b/drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c +@@ -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); +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c +index 46a35c7..c69fa4b 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c +@@ -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) +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h +index 5944a3b..e862caf 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h +@@ -1424,12 +1424,8 @@ void dpp1_set_degamma( + enum ipp_degamma_mode mode); + + void dpp1_set_degamma_pwl(struct dpp *dpp_base, +- const struct pwl_params *params); ++ 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); +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c +index 4ddd627..f862fd1 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c +@@ -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 +diff --git a/drivers/gpu/drm/amd/display/include/fixed31_32.h b/drivers/gpu/drm/amd/display/include/fixed31_32.h +index 2b1b29f..52a7333 100644 +--- a/drivers/gpu/drm/amd/display/include/fixed31_32.h ++++ b/drivers/gpu/drm/amd/display/include/fixed31_32.h +@@ -503,6 +503,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); +-- +2.7.4 + |