diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
index 53b6c6c75744a31be6c7b01991c57474056e3823..ab8cfad5a9b01f060769ad41bab7297867316a46 100644
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/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);