]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/amd/display: fix usb-c dongle regression
authorEric Yang <Eric.Yang2@amd.com>
Thu, 7 Sep 2017 18:53:23 +0000 (14:53 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 21 Oct 2017 20:40:07 +0000 (16:40 -0400)
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>
drivers/gpu/drm/amd/display/dc/core/dc_link.c

index ee23b609d7dd3bf18e57943a2cfa4e624774ded6..d5eaebeaeb89cdd275578bc099bbc404bc0fbd3d 100644 (file)
@@ -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;