From f2a103a6b776f672a9dd02dd4dd8255a10d9c53c Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 23 Jul 2010 11:39:03 +1000
Subject: [PATCH] --- yaml --- r: 205103 b: refs/heads/master c:
 b01f06085e62c36659a5b6bde359ed1d98da91d7 h: refs/heads/master i:   205101:
 d74d6208d33b0f49696836cc4f08faadeb97a542   205099:
 820324c427f0e1da5a167eb6da2fa38656a3d894   205095:
 1c346c977d56a1430a1e9f786692312655854eff   205087:
 4ce8679c17cbe0b7248ac445a49a9a7b40bbfec9 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_dp.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 689e5fffc2ad..7d8319d0d964 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0875edd9374296af8702d850254809e34a809cd
+refs/heads/master: b01f06085e62c36659a5b6bde359ed1d98da91d7
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c b/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c
index 184bc9570b1c..64b43958e582 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -23,8 +23,10 @@
  */
 
 #include "drmP.h"
+
 #include "nouveau_drv.h"
 #include "nouveau_i2c.h"
+#include "nouveau_connector.h"
 #include "nouveau_encoder.h"
 
 static int
@@ -271,6 +273,7 @@ nouveau_dp_link_train(struct drm_encoder *encoder)
 {
 	struct drm_device *dev = encoder->dev;
 	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
+	struct nouveau_connector *nv_connector;
 	struct bit_displayport_encoder_table *dpe;
 	int dpe_headerlen;
 	uint8_t config[4], status[3];
@@ -279,12 +282,21 @@ nouveau_dp_link_train(struct drm_encoder *encoder)
 
 	NV_DEBUG_KMS(dev, "link training!!\n");
 
+	nv_connector = nouveau_encoder_connector_get(nv_encoder);
+	if (!nv_connector)
+		return false;
+
 	dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
 	if (!dpe) {
 		NV_ERROR(dev, "SOR-%d: no DP encoder table!\n", nv_encoder->or);
 		return false;
 	}
 
+	/* disable hotplug detect, this flips around on some panels during
+	 * link training.
+	 */
+	nv50_gpio_irq_enable(dev, nv_connector->dcb->gpio_tag, false);
+
 	if (dpe->script0) {
 		NV_DEBUG_KMS(dev, "SOR-%d: running DP script 0\n", nv_encoder->or);
 		nouveau_bios_run_init_table(dev, le16_to_cpu(dpe->script0),
@@ -423,6 +435,9 @@ nouveau_dp_link_train(struct drm_encoder *encoder)
 					    nv_encoder->dcb);
 	}
 
+	/* re-enable hotplug detect */
+	nv50_gpio_irq_enable(dev, nv_connector->dcb->gpio_tag, true);
+
 	return eq_done;
 }