diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4064-drm-amd-display-Use-dcn1-Optimal-Taps-Get.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4064-drm-amd-display-Use-dcn1-Optimal-Taps-Get.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4064-drm-amd-display-Use-dcn1-Optimal-Taps-Get.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4064-drm-amd-display-Use-dcn1-Optimal-Taps-Get.patch new file mode 100644 index 00000000..53cf9e01 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4064-drm-amd-display-Use-dcn1-Optimal-Taps-Get.patch @@ -0,0 +1,89 @@ +From 14e1a4613443a646b1bce8e87879b328e487039d Mon Sep 17 00:00:00 2001 +From: Wesley Chalmers <Wesley.Chalmers@amd.com> +Date: Fri, 13 Sep 2019 13:43:36 -0400 +Subject: [PATCH 4064/4256] 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: Wesley Chalmers <Wesley.Chalmers@amd.com> +Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> +Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 4 ++-- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 5 +++++ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 5 ----- + 4 files changed, 8 insertions(+), 8 deletions(-) + +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 d8b2da18db39..997e9582edc7 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c +@@ -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, +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 e2c613611ac9..1d4a7d640334 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h +@@ -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, +diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c +index ae8534308229..4d7e45892f08 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c +@@ -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, +diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h +index f8db8ad593f8..5b03b737b1d6 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h +@@ -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, +-- +2.17.1 + |