Commit da2f84ba authored Jan 21, 2020 by Harry Wentland Committed by Alex Deucher Jan 27, 2020

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



This reverts commit 80adaebd.

[WHY]
This change was working around a regression that occured in this:
commit 0301ccba ("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>

parent 3eb6d7ac

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message