Revert "drm/amd/display: Don't skip link training for empty dongle"

This reverts commit f9a238ec4d7c86bc140151a88149ce6dc8df7a0a.

[WHY]
This change was working around a regression that occured in this:
commit a199d8733541 ("drm/amd/display: DP Compliance 400.1.1 failure")

With the fix to run verify_link_cap when the SINK_COUNT of
dongles becomes non-zero this change is no longer needed.

Cc: Louis Li <Ching-shih.Li@amd.com>
Cc: Wenjing Liu <Wenjing.Liu@amd.com>
Cc: Hersen Wu <hersenxs.wu@amd.com>
Cc: Eric Yang <Eric.Yang2@amd.com>
Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 cc2e050035954413ff18cd0c1b78f0fee71602d0..a09119c10d7c9399724e45f741f985befb6b3ff9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -851,18 +851,12 @@ static bool dc_link_detect_helper(struct dc_link *link,
                                if (memcmp(&link->dpcd_caps, &prev_dpcd_caps, sizeof(struct dpcd_caps)))
                                        same_dpcd = false;
                        }
-                       /* Active dongle plug in without display or downstream unplug*/
+                       /* Active dongle downstream unplug*/
                        if (link->type == dc_connection_active_dongle &&
                                link->dpcd_caps.sink_count.bits.SINK_COUNT == 0) {
-                               if (prev_sink != NULL) {
+                               if (prev_sink != NULL)
                                        /* Downstream unplug */
                                        dc_sink_release(prev_sink);
-                               } else {
-                                       /* Empty dongle plug in */
-                                       dp_verify_link_cap_with_retries(link,
-                                                       &link->reported_link_cap,
-                                                       LINK_TRAINING_MAX_VERIFY_RETRY);
-                               }
                                return true;
                        }