1 files changed, 69 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0068-drm-radeon-fix-hotplug-of-DP-to-DVI-HDMI-passive-ada.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0068-drm-radeon-fix-hotplug-of-DP-to-DVI-HDMI-passive-ada.patch
new file mode 100644
index 00000000..0872ed35
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.25/0068-drm-radeon-fix-hotplug-of-DP-to-DVI-HDMI-passive-ada.patch
@@ -0,0 +1,69 @@
+From 0de546b55811738998d83bb6e677306d65e90861 Mon Sep 17 00:00:00 2001
+From: Jerome Glisse <jglisse@redhat.com>
+Date: Thu, 19 Jul 2012 17:15:56 -0400
+Subject: [PATCH 68/73] drm/radeon: fix hotplug of DP to DVI|HDMI passive
+ adapters (v2)
+
+commit 266dcba541a1ef7e5d82d9e67c67fde2910636e8 upstream.
+
+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.
+
+Signed-off-by: Jerome Glisse <jglisse@redhat.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/gpu/drm/radeon/radeon_connectors.c |   29 ++++++++++++++++++++-------
+ 1 files changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
+index 4a4493f..fb8db7a 100644
+--- a/drivers/gpu/drm/radeon/radeon_connectors.c
++++ b/drivers/gpu/drm/radeon/radeon_connectors.c
+@@ -64,14 +64,27 @@ 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;
+-
+-               /* Only turn off the display it 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))
+-                       drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
+-               connector->dpms = saved_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;
++
++               /* 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))
++                               drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
++                       connector->dpms = saved_dpms;
++               }
+        }
+ }
+ 
+-- 
+1.7.7.6
+