drm/amd/display: verify stream link before link test

BugLink: https://bugs.launchpad.net/bugs/1860490
[ Upstream commit b131932215c993ea5adf8192d1de2e8d6b23048d ]

[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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

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 a9135764e5806613c970e0a36827215926f4d161..767de9d6b07a7c3343b77c2e615fd863830845a3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
@@ -312,7 +312,8 @@ void dp_retrain_link_dp_test(struct dc_link *link,
                if (pipes[i].stream != NULL &&
                        !pipes[i].top_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(