blob: d5c93dc4f4ca77090c11a795d4431c173e326b0d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From deee6a1f1380d2a4ecc7ddc190824a6e72b09b47 Mon Sep 17 00:00:00 2001
From: Wenjing Liu <Wenjing.Liu@amd.com>
Date: Thu, 21 Sep 2017 18:53:40 -0400
Subject: [PATCH 2494/4131] drm/amd/display: update link type to mst before
topology discovery
[Description]
link type is not updated before mst topology discovery.
This causes issue when branch device response to link address after before
the start topology discovery event finishes.
[Solution]
update link type to mst before topology discovery
Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 976f0f1..a58e61b 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -496,6 +496,7 @@ static void detect_dp(
}
if (is_mst_supported(link)) {
sink_caps->signal = SIGNAL_TYPE_DISPLAY_PORT_MST;
+ link->type = dc_connection_mst_branch;
/*
* This call will initiate MST topology discovery. Which
@@ -524,12 +525,11 @@ static void detect_dp(
if (reason == DETECT_REASON_BOOT)
boot = true;
- if (dm_helpers_dp_mst_start_top_mgr(
+ if (!dm_helpers_dp_mst_start_top_mgr(
link->ctx,
link, boot)) {
- link->type = dc_connection_mst_branch;
- } else {
/* MST not supported */
+ link->type = dc_connection_single;
sink_caps->signal = SIGNAL_TYPE_DISPLAY_PORT;
}
}
--
2.7.4
|
