From: Eric Yang Date: Thu, 7 Sep 2017 18:53:23 +0000 (-0400) Subject: drm/amd/display: fix usb-c dongle regression X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1049e39fa62f443aae64a2fb6057b96abf20e8de;p=linux.git 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 Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- 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 ee23b609d7dd3..d5eaebeaeb89c 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;