]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
drm/amd/display: verify stream link before link test
authorJing Zhou <Jing.Zhou@amd.com>
Thu, 22 Aug 2019 06:26:33 +0000 (14:26 +0800)
committerSeth Forshee <seth.forshee@canonical.com>
Mon, 6 Jan 2020 14:14:52 +0000 (08:14 -0600)
BugLink: https://bugs.launchpad.net/bugs/1858428
[ 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: Seth Forshee <seth.forshee@canonical.com>
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c

index 79438c4f1e20be86f2cadd3a6b7a28c2a577fee9..a519dbc5ecb65317b766ce92023a276303a23403 100644 (file)
@@ -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(