summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/core
diff options
context:
space:
mode:
authorJing Zhou <Jing.Zhou@amd.com>2019-08-22 14:26:33 +0800
committerAlex Deucher <alexander.deucher@amd.com>2019-09-13 18:03:28 -0500
commitb131932215c993ea5adf8192d1de2e8d6b23048d (patch)
treee9f9ebaa32303e4a3f8ad9de8e5dff855dbb5e45 /drivers/gpu/drm/amd/display/dc/core
parentd6bbece2c419debff6fc6b3c7a59fbede53bdef3 (diff)
downloadlinux-stable-b131932215c993ea5adf8192d1de2e8d6b23048d.tar.gz
linux-stable-b131932215c993ea5adf8192d1de2e8d6b23048d.tar.bz2
linux-stable-b131932215c993ea5adf8192d1de2e8d6b23048d.zip
drm/amd/display: verify stream link before link test
[Why] DP1.2 LL CTS test failure. [How] The failure is caused by not verify stream link is equal to link, only check stream and link is not null. Signed-off-by: Jing Zhou <Jing.Zhou@amd.com> Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com> Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/core')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
index 79438c4f1e20..a519dbc5ecb6 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
@@ -277,7 +277,8 @@ void dp_retrain_link_dp_test(struct dc_link *link,
if (pipes[i].stream != NULL &&
!pipes[i].top_pipe && !pipes[i].prev_odm_pipe &&
pipes[i].stream->link != NULL &&
- pipes[i].stream_res.stream_enc != NULL) {
+ pipes[i].stream_res.stream_enc != NULL &&
+ pipes[i].stream->link == link) {
udelay(100);
pipes[i].stream_res.stream_enc->funcs->dp_blank(