---

yaml --- r: 282606 b: refs/heads/master c: 6805979 h: refs/heads/master v: v3
git-mirror · Dec 21, 2011 · 761493a · 761493a
1 parent d65bca8
commit 761493a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06784090ecb3f925616fc797164a74b03d5c0968
+refs/heads/master: 6805979fa9090b2c69c645cf19bba9a2849f336b
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -562,8 +562,11 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data)
 	}
 	nv_mask(dev, 0x00c040, 0x0c000c00, info->amast);
 
-	/* core/shader: switch core to dom6, shader to hclk */
-	if (dev_priv->chipset == 0x50)
+	/* core/shader: make sure sclk/nvclk are disconnected from their
+	 * plls (nvclk to dom6, sclk to hclk), modify the plls, and
+	 * reconnect sclk/nvclk to their new clock source
+	 */
+	if (dev_priv->chipset < 0x92)
 		nv_mask(dev, 0x00c040, 0x001000b0, 0x00100080); /* grrr! */
 	else
 		nv_mask(dev, 0x00c040, 0x000000b3, 0x00000081);