drm/amd/display: Revert "Disconnect non-DP with no EDID"
authorRoy Chan <roy.chan@amd.com>
Thu, 20 May 2021 20:20:39 +0000 (16:20 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 8 Jun 2021 16:23:43 +0000 (12:23 -0400)
[Why]
Found a use case (IPKVM) that DP-VGA active dongle does
not return any EDID and the mentioned commit broke it.

[How]
This reverts "Disconnect non-DP with no EDID"

Signed-off-by: Roy Chan <roy.chan@amd.com>
Reviewed-by: Chris Park <Chris.Park@amd.com>
Acked-by: Stylon Wang <stylon.wang@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc_link.c

index befce59..0f91280 100644 (file)
@@ -1099,24 +1099,6 @@ static bool dc_link_detect_helper(struct dc_link *link,
                            dc_is_dvi_signal(link->connector_signal)) {
                                if (prev_sink)
                                        dc_sink_release(prev_sink);
-                               link_disconnect_sink(link);
-
-                               return false;
-                       }
-                       /*
-                        * Abort detection for DP connectors if we have
-                        * no EDID and connector is active converter
-                        * as there are no display downstream
-                        *
-                        */
-                       if (dc_is_dp_sst_signal(link->connector_signal) &&
-                               (link->dpcd_caps.dongle_type ==
-                                               DISPLAY_DONGLE_DP_VGA_CONVERTER ||
-                               link->dpcd_caps.dongle_type ==
-                                               DISPLAY_DONGLE_DP_DVI_CONVERTER)) {
-                               if (prev_sink)
-                                       dc_sink_release(prev_sink);
-                               link_disconnect_sink(link);
 
                                return false;
                        }