---

yaml
---
r: 218223
b: refs/heads/master
c: e829d80
h: refs/heads/master
i:
  218221: fd5b286
  218219: 215eefc
  218215: 08b9016
  218207: af2ea05
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67e1d4fbaefd6a27b55523bb6bb0dd941351a325
+refs/heads/master: e829d804d78c57b8e90039079284ac585f72851d

trunk/drivers/gpu/drm/nouveau/nouveau_perf.c

@@ -136,15 +136,21 @@ 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:
 		case 0x24:
 			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];