summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorEric Yang <Eric.Yang2@amd.com>2017-09-07 14:53:23 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-10-21 16:40:07 -0400
commit1049e39fa62f443aae64a2fb6057b96abf20e8de (patch)
treeabb63115a609413d2ef7bc4a11f9f80e4d568f54 /drivers/gpu/drm/amd
parent5088cc98f59b922a609078c048a25e30f94b9216 (diff)
drm/amd/display: fix usb-c dongle regression
A previous change moved link_disconnect_sink after dpcd read, this causes the sink count to be overwritten which in turn causes another detection to be triggered in the short pulse handler, which brings down the display. Signed-off-by: Eric Yang <Eric.Yang2@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link.c2
1 files changed, 0 insertions, 2 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 ee23b609d7dd..d5eaebeaeb89 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -652,8 +652,6 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
if (link->local_sink) {
sink = link->local_sink;
} else {
- link_disconnect_sink(link);
-
sink_init_data.link = link;
sink_init_data.sink_signal = sink_caps.signal;