From: George Shen Date: Wed, 6 Oct 2021 19:47:37 +0000 (-0400) Subject: drm/amd/display: Fix in overriding DP drive settings X-Git-Tag: v6.0-rc1~138^2~16^2~84 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95133f41b090b09ba9163b4469cda1d5ee230cd3;p=thirdparty%2Fkernel%2Flinux.git drm/amd/display: Fix in overriding DP drive settings [Why & How] Check always_match_dpcd_with_hw_lane_settings bit before overriding the DP drive settings Tested-by: Daniel Wheeler Reviewed-by: Wenjing Liu Acked-by: Alan Liu Signed-off-by: George Shen Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index ef771471aa39e..9f873d2cdcad4 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -1674,8 +1674,9 @@ static void override_training_settings( : POST_CURSOR2_DISABLED; } - dp_hw_to_dpcd_lane_settings(lt_settings, - lt_settings->hw_lane_settings, lt_settings->dpcd_lane_settings); + if (lt_settings->always_match_dpcd_with_hw_lane_settings) + dp_hw_to_dpcd_lane_settings(lt_settings, + lt_settings->hw_lane_settings, lt_settings->dpcd_lane_settings); /* Initialize training timings */ if (overrides->cr_pattern_time != NULL)