Commit 62fb675b authored by Gabe Teeger's avatar Gabe Teeger Committed by Wen Zhiwei
Browse files

drm/amd/display: Revert Avoid overflow assignment 

stable inclusion
from stable-v6.6.55
commit eada63e6e33772f1453bfe28cf272aadfd178a90
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB0MX4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=eada63e6e33772f1453bfe28cf272aadfd178a90



--------------------------------

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: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarGabe Teeger <Gabe.Teeger@amd.com>
Signed-off-by: default avatarWayne Lin <wayne.lin@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 45e739dc

drivers/gpu/drm/amd/display/dc/dc_dp_types.h

+1 −1
Original line number Diff line number Diff line
@@ -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];

drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c

+1 −2
Original line number Diff line number Diff line
@@ -849,7 +849,6 @@ 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;

			core_link_write_dpcd(link, DP_TRAINING_PATTERN_SET,

					     &training_pattern.raw,

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

+0 −1
Original line number Diff line number Diff line
@@ -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,