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

Commit 266dcba5 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon: fix hotplug of DP to DVI|HDMI passive adapters (v2) 



No need to retrain the link for passive adapters.

v2: agd5f
- no passive DP to VGA adapters, update comments
- assign radeon_connector_atom_dig after we are sure
  we have a digital connector as analog connectors
  have different private data.
- get new sink type before checking for retrain.  No
  need to check if it's no longer a DP connection.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 8d1c702a

drivers/gpu/drm/radeon/radeon_connectors.c

+21 −8
Original line number Diff line number Diff line
@@ -64,9 +64,21 @@ void radeon_connector_hotplug(struct drm_connector *connector) 


	/* just deal with DP (not eDP) here. */

	if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {

		int saved_dpms = connector->dpms;

		struct radeon_connector_atom_dig *dig_connector =

			radeon_connector->con_priv;



		/* if existing sink type was not DP no need to retrain */

		if (dig_connector->dp_sink_type != CONNECTOR_OBJECT_ID_DISPLAYPORT)

			return;



		/* Only turn off the display it it's physically disconnected */

		/* first get sink type as it may be reset after (un)plug */

		dig_connector->dp_sink_type = radeon_dp_getsinktype(radeon_connector);

		/* don't do anything if sink is not display port, i.e.,

		 * passive dp->(dvi|hdmi) adaptor

		 */

		if (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) {

			int saved_dpms = connector->dpms;

			/* Only turn off the display if it's physically disconnected */

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

				drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);

			else if (radeon_dp_needs_link_train(radeon_connector))
@@ -74,6 +86,7 @@ void radeon_connector_hotplug(struct drm_connector *connector) 
			connector->dpms = saved_dpms;

		}

	}

}



static void radeon_property_change_mode(struct drm_encoder *encoder)

{