Attachment 50185 Details for Bug 39882 – fix

[patch] fix

0001-drm-radeon-kms-don-t-try-to-be-smart-in-the-hpd-hand.patch (text/plain), 3.87 KB, created by Alex Deucher on 2011-08-13 10:28:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2011-08-13 10:28:00 UTC

Size: 3.87 KB

patch

obsolete

>From 992d02e0b38fd10d72f9b4682ab3d179569a1b89 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Sat, 13 Aug 2011 13:17:04 -0400
>Subject: [PATCH] drm/radeon/kms: don't try to be smart in the hpd handler
>
>Attempting to try and turn off disconnected display hw in the
>hotput handler lead to more problems than it helped.  For
>now just register an event and only attempt the do something
>interesting with DP.  Other connectors are just too problematic:
>- Some systems have an HPD pin assigned to LVDS, but it's rarely
>if ever connected properly and we don't really care about hpd
>events on LVDS anyway since it's always connected.
>- The HPD pin is wired up correctly for eDP, but we don't really
>have to do anything since the events since it's always connected.
>- Some HPD pins fire more than once when you connect/disconnect
>- etc.
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=39882
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@kernel.org
>---
> drivers/gpu/drm/radeon/atombios_dp.c       |   12 ++++++++++++
> drivers/gpu/drm/radeon/radeon_connectors.c |   14 ++++++--------
> drivers/gpu/drm/radeon/radeon_mode.h       |    1 +
> 3 files changed, 19 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
>index 645b84b..7ad43c6 100644
>--- a/drivers/gpu/drm/radeon/atombios_dp.c
>+++ b/drivers/gpu/drm/radeon/atombios_dp.c
>@@ -613,6 +613,18 @@ static bool radeon_dp_get_link_status(struct radeon_connector *radeon_connector,
> 	return true;
> }
> 
>+bool radeon_dp_needs_link_train(struct radeon_connector *radeon_connector)
>+{
>+	u8 link_status[DP_LINK_STATUS_SIZE];
>+	struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
>+
>+	if (!radeon_dp_get_link_status(radeon_connector, link_status))
>+		return false;
>+	if (dp_channel_eq_ok(link_status, dig->dp_lane_count))
>+		return false;
>+	return true;
>+}
>+
> struct radeon_dp_link_train_info {
> 	struct radeon_device *rdev;
> 	struct drm_encoder *encoder;
>diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
>index b8ccdd7..df7ed82 100644
>--- a/drivers/gpu/drm/radeon/radeon_connectors.c
>+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
>@@ -64,18 +64,16 @@ void radeon_connector_hotplug(struct drm_connector *connector)
> 	if (connector->dpms != DRM_MODE_DPMS_ON)
> 		return;
> 
>-	/* powering up/down the eDP panel generates hpd events which
>-	 * can interfere with modesetting.
>-	 */
>-	if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
>-		return;
>+	/* just deal with DP (not eDP) here. */
>+	if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
>+		int saved_dpms = connector->dpms;
> 
>-	/* pre-r600 did not always have the hpd pins mapped accurately to connectors */
>-	if (rdev->family >= CHIP_R600) {
>-		if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd))
>+		if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd) &&
>+		    radeon_dp_needs_link_train(radeon_connector))
> 			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
> 		else
> 			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
>+		connector->dpms = saved_dpms;
> 	}
> }
> 
>diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
>index 6df4e3c..f2e8267 100644
>--- a/drivers/gpu/drm/radeon/radeon_mode.h
>+++ b/drivers/gpu/drm/radeon/radeon_mode.h
>@@ -476,6 +476,7 @@ extern void radeon_dp_set_link_config(struct drm_connector *connector,
> 				      struct drm_display_mode *mode);
> extern void radeon_dp_link_train(struct drm_encoder *encoder,
> 				 struct drm_connector *connector);
>+extern bool radeon_dp_needs_link_train(struct radeon_connector *radeon_connector);
> extern u8 radeon_dp_getsinktype(struct radeon_connector *radeon_connector);
> extern bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector);
> extern void atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mode);
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 39882: 49992 | 49993 | 49994 | 50185

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.