From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 31 Oct 2011 02:14:10 +0000 (+1000)
Subject: drm/nv50/pm: only touch 0x611200 on nv92-
X-Git-Tag: Ubuntu-5.0.0-8.9~16999^2~51^2~49
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d2491567cdbcb87b2682e0948a69d73c4dd8987e;p=mirror_ubuntu-disco-kernel.git

drm/nv50/pm: only touch 0x611200 on nv92-

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
index 961d8f20d27f..e7ff5acce65f 100644
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -594,8 +594,10 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data)
 	}
 
 	/* disable display */
-	nv_wr32(dev, 0x611200, 0x00003300);
-	udelay(100);
+	if (dev_priv->chipset >= 0x92) {
+		nv_wr32(dev, 0x611200, 0x00003300);
+		udelay(100);
+	}
 
 	/* prepare ram for reclocking */
 	nv_wr32(dev, 0x1002d4, 0x00000001); /* precharge */
@@ -617,7 +619,8 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data)
 	udelay(100);
 
 	/* re-enable display */
-	nv_wr32(dev, 0x611200, 0x00003330);
+	if (dev_priv->chipset >= 0x92)
+		nv_wr32(dev, 0x611200, 0x00003330);
 
 	goto resume;
 error: