drm/amd/display: Don't repeat DAC load detection

The analog link detection code path had already performed the
DAC load detection by the time the EDID read is attempted.
So there is no need to repeat the DAC load detection,
we can know that no display is connected if no EDID is read.

Fixes: ac1bb4952267 ("drm/amd/display: Use DAC load detection on analog connectors (v2)")
Suggested-by: Alex Hung <alex.hung@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/link/link_detection.c b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
index 03db7116cf093ba4ec6f6571b2324b3020d4506f..f24365395cd9a28689a96de84a6b168e2cc95374 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
@@ -1173,11 +1173,10 @@ static bool detect_link_and_local_sink(struct dc_link *link,
                         * - cheap DVI-A cable or adapter that doesn't connect DDC
                         */
                        if (dc_connector_supports_analog(link->link_id.id)) {
-                               /* If we didn't do DAC load detection yet, do it now
-                                * to verify there really is a display connected.
+                               /* If we didn't already detect a display using
+                                * DAC load detection, we know it isn't connected.
                                 */
-                               if (link->type != dc_connection_analog_load &&
-                                       !link_detect_dac_load_detect(link)) {
+                               if (link->type != dc_connection_analog_load) {
                                        if (prev_sink)
                                                dc_sink_release(prev_sink);
                                        link_disconnect_sink(link);