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

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

drm/radeon/kms: improve DP detect logic 



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

drivers/gpu/drm/radeon/radeon_connectors.c

+13 −5
Original line number Diff line number Diff line
@@ -1142,6 +1142,8 @@ bool radeon_connector_is_dp12_capable(struct drm_connector *connector) 
static enum drm_connector_status

radeon_dp_detect(struct drm_connector *connector, bool force)

{

	struct drm_device *dev = connector->dev;

	struct radeon_device *rdev = dev->dev_private;

	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;
@@ -1164,6 +1166,11 @@ radeon_dp_detect(struct drm_connector *connector, bool force) 
						     ATOM_TRANSMITTER_ACTION_POWER_OFF);

	} else {

		radeon_dig_connector->dp_sink_type = radeon_dp_getsinktype(radeon_connector);

		if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd)) {

			ret = connector_status_connected;

			if (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT)

				radeon_dp_getdpcd(radeon_connector);

		} else {

			if (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) {

				if (radeon_dp_getdpcd(radeon_connector))

					ret = connector_status_connected;
@@ -1172,6 +1179,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force) 
					ret = connector_status_connected;

			}

		}

	}



	radeon_connector_update_scratch_regs(connector, ret);

	return ret;