---

yaml --- r: 250687 b: refs/heads/master c: 96d1fcf h: refs/heads/master i: 250685: 48e9fd5 250683: cab1c4d 250679: ea9e2d7 250671: 266de6d 250655: 184ece9 250623: 9d83f4b v: v3
git-mirror · May 16, 2011 · d39139a · d39139a
1 parent 1b73fdb
commit d39139a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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;