Commit d94df7ca authored by Gabe Teeger's avatar Gabe Teeger Committed by Alex Deucher
Browse files

drm/amd/display: Fix DP-DVI dongle hotplug 



[why]
Hotplugging with a DVI-DP dongle on pre-rdna embedded platform
working about half the time. The regression was found to be the
setting of link->type here.
[what]
Reverts fix besides the logging added.

Reviewed-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Signed-off-by: default avatarJerry Zuo <jerry.zuo@amd.com>
Signed-off-by: default avatarGabe Teeger <gabe.teeger@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c18fa08e

drivers/gpu/drm/amd/display/dc/link/link_detection.c

+1 −4
Original line number Diff line number Diff line
@@ -863,7 +863,6 @@ static bool detect_link_and_local_sink(struct dc_link *link, 
	struct dc_sink *prev_sink = NULL;

	struct dpcd_caps prev_dpcd_caps;

	enum dc_connection_type new_connection_type = dc_connection_none;

	enum dc_connection_type pre_connection_type = link->type;

	const uint32_t post_oui_delay = 30; // 30ms



	DC_LOGGER_INIT(link->ctx->logger);
@@ -965,7 +964,6 @@ static bool detect_link_and_local_sink(struct dc_link *link, 
			}



			if (!detect_dp(link, &sink_caps, reason)) {

				link->type = pre_connection_type;



				if (prev_sink)

					dc_sink_release(prev_sink);
@@ -1299,8 +1297,7 @@ bool link_detect(struct dc_link *link, enum dc_detect_reason reason) 
			link->dpcd_caps.is_mst_capable)

		is_delegated_to_mst_top_mgr = discover_dp_mst_topology(link, reason);



	if (is_local_sink_detect_success &&

			pre_link_type == dc_connection_mst_branch &&

	if (pre_link_type == dc_connection_mst_branch &&

			link->type != dc_connection_mst_branch)

		is_delegated_to_mst_top_mgr = link_reset_cur_dp_mst_topology(link);