From d39139a3f4ce17b165e6eae6661cff1b1a7e5ef0 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 20 Apr 2011 14:36:13 +1000
Subject: [PATCH] --- yaml --- r: 250687 b: refs/heads/master c:
 96d1fcf8b5a3a9c66fddeaa9fb71e4e68ee2e08b h: refs/heads/master i:   250685:
 48e9fd53962b4a6fc23f26a65c16e26be4c2f77b   250683:
 cab1c4d12cbece05787a039d23ed3af70c4e7a57   250679:
 ea9e2d77724763894366df9076e23d83519547ca   250671:
 266de6d03a786cf30d456d4a4c353ac3f6d8f408   250655:
 184ece985d4b0502f653df6f13878e3e49022ac2   250623:
 9d83f4bf008f5d9ee488c4b35f89dc7acd8030ee v: v3

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

diff --git a/[refs] b/[refs]
index 865688fcdf15..06ab161c871c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfb61f43b37158d432a1897bc2a4bbbd41215fae
+refs/heads/master: 96d1fcf8b5a3a9c66fddeaa9fb71e4e68ee2e08b
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c b/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c
index 6e3f93334a97..922fb6b664ed 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c
@@ -116,8 +116,10 @@ nouveau_perf_timing(struct drm_device *dev, struct bit_entry *P,
 		entries   = tmap[4];
 	}
 
-	ramcfg = nv_rd32(dev, NV_PEXTDEV_BOOT_0) & 0x0000003c;
-	ramcfg >>= 2;
+	ramcfg = (nv_rd32(dev, NV_PEXTDEV_BOOT_0) & 0x0000003c) >> 2;
+	if (bios->ram_restrict_tbl_ptr)
+		ramcfg = bios->data[bios->ram_restrict_tbl_ptr + ramcfg];
+
 	if (ramcfg >= entries) {
 		NV_WARN(dev, "ramcfg strap out of bounds!\n");
 		return NULL;