---

yaml --- r: 282610 b: refs/heads/master c: d249156 h: refs/heads/master v: v3
git-mirror · Dec 21, 2011 · 2841c47 · 2841c47
1 parent e3009c7
commit 2841c47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b5f4d0def9caa16527c95e7a4ba47bb8a4d9e1e
+refs/heads/master: d2491567cdbcb87b2682e0948a69d73c4dd8987e
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c b/trunk/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: