Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f50eae7 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: rework radeon_dp_detect() logic 



If the connector is eDP, it can only be DP, not TMDS.
Always set the detected sink type.  If the sink is
detected as non-DP, but there is no EDID, you can still
manually force the port on.  If the sink type is DP
and there's no DPCD, there's no way to force the monitor
on since you need both ends to train the link.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9c1ac0c6

drivers/gpu/drm/radeon/radeon_connectors.c

+11 −10
Original line number Diff line number Diff line
@@ -977,23 +977,24 @@ static enum drm_connector_status radeon_dp_detect(struct drm_connector *connecto 
	struct radeon_connector *radeon_connector = to_radeon_connector(connector);

	enum drm_connector_status ret = connector_status_disconnected;

	struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv;

	u8 sink_type;



	if (radeon_connector->edid) {

		kfree(radeon_connector->edid);

		radeon_connector->edid = NULL;

	}



	sink_type = radeon_dp_getsinktype(radeon_connector);

	if ((sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||

	    (sink_type == CONNECTOR_OBJECT_ID_eDP)) {

		if (radeon_dp_getdpcd(radeon_connector)) {

			radeon_dig_connector->dp_sink_type = sink_type;

	if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {

		/* eDP is always DP */

		radeon_dig_connector->dp_sink_type = CONNECTOR_OBJECT_ID_DISPLAYPORT;

		if (radeon_dp_getdpcd(radeon_connector))

			ret = connector_status_connected;

	} else {

		radeon_dig_connector->dp_sink_type = radeon_dp_getsinktype(radeon_connector);

		if (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) {

			if (radeon_dp_getdpcd(radeon_connector))

				ret = connector_status_connected;

		}

		} else {

		if (radeon_ddc_probe(radeon_connector)) {

			radeon_dig_connector->dp_sink_type = sink_type;

			if (radeon_ddc_probe(radeon_connector))

				ret = connector_status_connected;

		}

	}