Commit 0d89268d authored by Timur Kristóf's avatar Timur Kristóf Committed by Alex Deucher
Browse files

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: ac1bb495 ("drm/amd/display: Use DAC load detection on analog connectors (v2)")
Suggested-by: default avatarAlex Hung <alex.hung@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarTimur Kristóf <timur.kristof@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bb5dfe2f

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

+3 −4
Original line number Diff line number Diff line
@@ -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);