From d167432015b092108d13bfbb11c91f60ac5ba038 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 6 Feb 2012 13:51:30 +1000
Subject: [PATCH] --- yaml --- r: 307524 b: refs/heads/master c:
 9d6ba0b58c5f1ea52b641c36178a27e876b80011 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/gpu/drm/nouveau/nvc0_pm.c | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fbf961f43d52..d453f2b75649 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a94ba1fcac417d0b72f73fb77e730279ca9203c3
+refs/heads/master: 9d6ba0b58c5f1ea52b641c36178a27e876b80011
diff --git a/trunk/drivers/gpu/drm/nouveau/nvc0_pm.c b/trunk/drivers/gpu/drm/nouveau/nvc0_pm.c
index a2f6ae0fa4bd..7c95c44e2887 100644
--- a/trunk/drivers/gpu/drm/nouveau/nvc0_pm.c
+++ b/trunk/drivers/gpu/drm/nouveau/nvc0_pm.c
@@ -500,6 +500,24 @@ mclk_mrs(struct nouveau_mem_exec_func *exec, int mr, u32 data)
 static void
 mclk_clock_set(struct nouveau_mem_exec_func *exec)
 {
+	struct nvc0_pm_state *info = exec->priv;
+	struct drm_device *dev = exec->dev;
+	u32 ctrl = nv_rd32(dev, 0x132000);
+
+	nv_wr32(dev, 0x137360, 0x00000001);
+	nv_wr32(dev, 0x137370, 0x00000000);
+	nv_wr32(dev, 0x137380, 0x00000000);
+	if (ctrl & 0x00000001)
+		nv_wr32(dev, 0x132000, (ctrl &= ~0x00000001));
+
+	nv_wr32(dev, 0x132004, info->mem.coef);
+	nv_wr32(dev, 0x132000, (ctrl |= 0x00000001));
+	nv_wait(dev, 0x137390, 0x00000002, 0x00000002);
+	nv_wr32(dev, 0x132018, 0x00005000);
+
+	nv_wr32(dev, 0x137370, 0x00000001);
+	nv_wr32(dev, 0x137380, 0x00000001);
+	nv_wr32(dev, 0x137360, 0x00000000);
 }
 
 static void
@@ -533,11 +551,15 @@ prog_mem(struct drm_device *dev, struct nvc0_pm_state *info)
 
 	if (dev_priv->chipset < 0xd0)
 		nv_wr32(dev, 0x611200, 0x00003300);
+	else
+		nv_wr32(dev, 0x62c000, 0x03030000);
 
 	nouveau_mem_exec(&exec, info->perflvl);
 
 	if (dev_priv->chipset < 0xd0)
 		nv_wr32(dev, 0x611200, 0x00003300);
+	else
+		nv_wr32(dev, 0x62c000, 0x03030300);
 }
 int
 nvc0_pm_clocks_set(struct drm_device *dev, void *data)
@@ -545,7 +567,7 @@ nvc0_pm_clocks_set(struct drm_device *dev, void *data)
 	struct nvc0_pm_state *info = data;
 	int i;
 
-	if (0)
+	if (info->mem.coef)
 		prog_mem(dev, info);
 
 	for (i = 0; i < 16; i++) {