diff options
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_perf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 6e3f93334a97..922fb6b664ed 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c | |||
@@ -116,8 +116,10 @@ nouveau_perf_timing(struct drm_device *dev, struct bit_entry *P, | |||
116 | entries = tmap[4]; | 116 | entries = tmap[4]; |
117 | } | 117 | } |
118 | 118 | ||
119 | ramcfg = nv_rd32(dev, NV_PEXTDEV_BOOT_0) & 0x0000003c; | 119 | ramcfg = (nv_rd32(dev, NV_PEXTDEV_BOOT_0) & 0x0000003c) >> 2; |
120 | ramcfg >>= 2; | 120 | if (bios->ram_restrict_tbl_ptr) |
121 | ramcfg = bios->data[bios->ram_restrict_tbl_ptr + ramcfg]; | ||
122 | |||
121 | if (ramcfg >= entries) { | 123 | if (ramcfg >= entries) { |
122 | NV_WARN(dev, "ramcfg strap out of bounds!\n"); | 124 | NV_WARN(dev, "ramcfg strap out of bounds!\n"); |
123 | return NULL; | 125 | return NULL; |