| From e80f8f491df873ea2e07c941c747831234814612 Mon Sep 17 00:00:00 2001 |
| From: Gabe Teeger <Gabe.Teeger@amd.com> |
| Date: Thu, 25 Jul 2024 18:42:21 -0400 |
| Subject: drm/amd/display: Revert Avoid overflow assignment |
| |
| From: Gabe Teeger <Gabe.Teeger@amd.com> |
| |
| commit e80f8f491df873ea2e07c941c747831234814612 upstream. |
| |
| This reverts commit a15268787b79 ("drm/amd/display: Avoid overflow assignment in link_dp_cts") |
| Due to regression causing DPMS hang. |
| |
| Reviewed-by: Alex Hung <alex.hung@amd.com> |
| Signed-off-by: Gabe Teeger <Gabe.Teeger@amd.com> |
| Signed-off-by: Wayne Lin <wayne.lin@amd.com> |
| Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 2 +- |
| drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c | 3 +-- |
| drivers/gpu/drm/amd/display/include/dpcd_defs.h | 1 - |
| 3 files changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/gpu/drm/amd/display/dc/dc_dp_types.h |
| +++ b/drivers/gpu/drm/amd/display/dc/dc_dp_types.h |
| @@ -721,7 +721,7 @@ struct dp_audio_test_data_flags { |
| struct dp_audio_test_data { |
| |
| struct dp_audio_test_data_flags flags; |
| - uint32_t sampling_rate; |
| + uint8_t sampling_rate; |
| uint8_t channel_count; |
| uint8_t pattern_type; |
| uint8_t pattern_period[8]; |
| --- a/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c |
| +++ b/drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c |
| @@ -849,8 +849,7 @@ bool dp_set_test_pattern( |
| core_link_read_dpcd(link, DP_TRAINING_PATTERN_SET, |
| &training_pattern.raw, |
| sizeof(training_pattern)); |
| - if (pattern <= PHY_TEST_PATTERN_END_DP11) |
| - training_pattern.v1_3.LINK_QUAL_PATTERN_SET = pattern; |
| + training_pattern.v1_3.LINK_QUAL_PATTERN_SET = pattern; |
| core_link_write_dpcd(link, DP_TRAINING_PATTERN_SET, |
| &training_pattern.raw, |
| sizeof(training_pattern)); |
| --- a/drivers/gpu/drm/amd/display/include/dpcd_defs.h |
| +++ b/drivers/gpu/drm/amd/display/include/dpcd_defs.h |
| @@ -76,7 +76,6 @@ enum dpcd_phy_test_patterns { |
| PHY_TEST_PATTERN_D10_2, |
| PHY_TEST_PATTERN_SYMBOL_ERROR, |
| PHY_TEST_PATTERN_PRBS7, |
| - PHY_TEST_PATTERN_END_DP11 = PHY_TEST_PATTERN_PRBS7, |
| PHY_TEST_PATTERN_80BIT_CUSTOM,/* For DP1.2 only */ |
| PHY_TEST_PATTERN_CP2520_1, |
| PHY_TEST_PATTERN_CP2520_2, |
