From f826c33f3c88b7792955089f980b80a501dfa93a Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 23 Sep 2010 15:34:09 +0200
Subject: [PATCH] --- yaml --- r: 218223 b: refs/heads/master c:
 e829d804d78c57b8e90039079284ac585f72851d h: refs/heads/master i:   218221:
 fd5b286645438e1877c50102d358641cc69bd50d   218219:
 215eefc2f586191b9786aa4ce7960fe27f47d256   218215:
 08b90169708ab3ce9e7ba88f5955a88efa9908b0   218207:
 af2ea0556c2a7c99cb611169b9dcfb80ac785691 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_perf.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9fd61f8f9035..a3a2ab26b595 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67e1d4fbaefd6a27b55523bb6bb0dd941351a325
+refs/heads/master: e829d804d78c57b8e90039079284ac585f72851d
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c b/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c
index 00f8243c6c73..6b641b69cb77 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c
@@ -136,7 +136,7 @@ nouveau_perf_init(struct drm_device *dev)
 			perflvl->fanspeed = entry[55];
 			perflvl->voltage = entry[56];
 			perflvl->core = ROM32(entry[1]) * 10;
-			perflvl->memory = ROM32(entry[5]) * 10;
+			perflvl->memory = ROM32(entry[5]) * 20;
 			break;
 		case 0x21:
 		case 0x23:
@@ -144,7 +144,13 @@ nouveau_perf_init(struct drm_device *dev)
 			perflvl->fanspeed = entry[4];
 			perflvl->voltage = entry[5];
 			perflvl->core = ROM16(entry[6]) * 1000;
-			perflvl->memory = ROM16(entry[11]) * 1000;
+
+			if (dev_priv->chipset == 0x49 ||
+			    dev_priv->chipset == 0x4b)
+				perflvl->memory = ROM16(entry[11]) * 1000;
+			else
+				perflvl->memory = ROM16(entry[11]) * 2000;
+
 			break;
 		case 0x25:
 			perflvl->fanspeed = entry[4];