Commit 58fe8990 authored by Hersen Wu's avatar Hersen Wu Committed by Alex Deucher
Browse files

drm/amd/display: Handle as MST first and then DP dongle if sink support both 



Signed-off-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Reviewed-by: default avatarWenjing Liu <Wenjing.Liu@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4ddd76d1

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

+16 −16
Original line number Diff line number Diff line
@@ -480,22 +480,6 @@ static void detect_dp( 
		sink_caps->signal = SIGNAL_TYPE_DISPLAY_PORT;

		detect_dp_sink_caps(link);



		/* DP active dongles */

		if (is_dp_active_dongle(link)) {

			link->type = dc_connection_active_dongle;

			if (!link->dpcd_caps.sink_count.bits.SINK_COUNT) {

				/*

				 * active dongle unplug processing for short irq

				 */

				link_disconnect_sink(link);

				return;

			}



			if (link->dpcd_caps.dongle_type !=

			DISPLAY_DONGLE_DP_HDMI_CONVERTER) {

				*converter_disable_audio = true;

			}

		}

		if (is_mst_supported(link)) {

			sink_caps->signal = SIGNAL_TYPE_DISPLAY_PORT_MST;

			link->type = dc_connection_mst_branch;
@@ -535,6 +519,22 @@ static void detect_dp( 
				sink_caps->signal = SIGNAL_TYPE_DISPLAY_PORT;

			}

		}



		if (link->type != dc_connection_mst_branch &&

			is_dp_active_dongle(link)) {

			/* DP active dongles */

			link->type = dc_connection_active_dongle;

			if (!link->dpcd_caps.sink_count.bits.SINK_COUNT) {

				/*

				 * active dongle unplug processing for short irq

				 */

				link_disconnect_sink(link);

				return;

			}



			if (link->dpcd_caps.dongle_type != DISPLAY_DONGLE_DP_HDMI_CONVERTER)

				*converter_disable_audio = true;

		}

	} else {

		/* DP passive dongles */

		sink_caps->signal = dp_passive_dongle_detection(link->ddc,

CRA Git | Maintained and supported by SUSTech CRA and CCSE