From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 23 Sep 2010 13:34:09 +0000 (+0200)
Subject: drm/nouveau: Double the perf table memory clocks on pre-G71 cards.
X-Git-Tag: v2.6.37-rc1~77^2~28^2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e829d804d78c57b8e90039079284ac585f72851d;p=profile%2Fivi%2Fkernel-x86-ivi.git

drm/nouveau: Double the perf table memory clocks on pre-G71 cards.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c
index 00f8243..6b641b6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/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];