aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenjing Liu <[email protected]>2017-09-21 18:53:40 -0400
committerAlex Deucher <[email protected]>2017-10-21 16:42:55 -0400
commite4ba6335cd91367f31978db1fc62d6bac0489672 (patch)
tree1d52b99c01039277e403516c969b898b950690dc
parentfcbbe3da0ab65dc114937857fce81902e3fa2a97 (diff)
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 <[email protected]> Reviewed-by: Tony Cheng <[email protected]> Acked-by: Harry Wentland <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link.c6
1 files 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 976f0f136f29..a58e61b6e9f9 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;
}
}