From 557fbc2a0caaf79325387aa0640cb1e3497cec55 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 27 Jan 2012 13:26:52 +1000
Subject: [PATCH] --- yaml --- r: 307515 b: refs/heads/master c:
 30e533900ea74a3499dad5c4660ebaf80b50d152 h: refs/heads/master i:   307513:
 b4195b02dae477c1676491895f7a60b34bbec8a7   307511:
 2c4554fda05efae03c03265e2371f5f22527e353 v: v3

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

diff --git a/[refs] b/[refs]
index 793d7aa6e769..cba961a16d6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27740383dde9e1f309a74cf39d96f3223dbf281c
+refs/heads/master: 30e533900ea74a3499dad5c4660ebaf80b50d152
diff --git a/trunk/drivers/gpu/drm/nouveau/nva3_pm.c b/trunk/drivers/gpu/drm/nouveau/nva3_pm.c
index 86d0de084784..98588292c802 100644
--- a/trunk/drivers/gpu/drm/nouveau/nva3_pm.c
+++ b/trunk/drivers/gpu/drm/nouveau/nva3_pm.c
@@ -393,12 +393,34 @@ mclk_clock_set(struct nouveau_mem_exec_func *exec)
 static void
 mclk_timing_set(struct nouveau_mem_exec_func *exec)
 {
+	struct drm_device *dev = exec->dev;
 	struct nva3_pm_state *info = exec->priv;
 	struct nouveau_pm_level *perflvl = info->perflvl;
+	u8 *ramcfg, ver, len;
 	int i;
 
 	for (i = 0; i < 9; i++)
-		nv_wr32(exec->dev, 0x100220 + (i * 4), perflvl->timing.reg[i]);
+		nv_wr32(dev, 0x100220 + (i * 4), perflvl->timing.reg[i]);
+
+	ramcfg = nouveau_perf_ramcfg(dev, perflvl->memory, &ver, &len);
+	if (ramcfg) {
+		u32 unk714 = nv_rd32(dev, 0x100714) & ~0xf0000010;
+		u32 unk718 = nv_rd32(dev, 0x100718) & ~0x00000100;
+		u32 unk71c = nv_rd32(dev, 0x10071c) & ~0x00000100;
+		if ( (ramcfg[2] & 0x20))
+			unk714 |= 0xf0000000;
+		if (!(ramcfg[2] & 0x04))
+			unk714 |= 0x00000010;
+		nv_wr32(dev, 0x100714, unk714);
+
+		if (ramcfg[2] & 0x01)
+			unk71c |= 0x00000100;
+		nv_wr32(dev, 0x10071c, unk71c);
+
+		if (ramcfg[2] & 0x02)
+			unk718 |= 0x00000100;
+		nv_wr32(dev, 0x100718, unk718);
+	}
 }
 
 static void