Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205041
b: refs/heads/master
c: fb4f562
h: refs/heads/master
i:
  205039: 4faca39
v: v3
  • Loading branch information
Ben Skeggs committed Jul 13, 2010
1 parent 428c6dd commit ffb19e9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cd0b072f95b3dbee5d7b97f52edc40f00d5d28e1
refs/heads/master: fb4f56214dd632d90b8ac64d7781faeb4dd744c7
3 changes: 2 additions & 1 deletion trunk/drivers/gpu/drm/nouveau/nouveau_mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,10 @@ nouveau_mem_detect(struct drm_device *dev)
} else {
dev_priv->vram_size = nv_rd32(dev, NV04_FIFO_DATA);
dev_priv->vram_size &= NV10_FIFO_DATA_RAM_AMOUNT_MB_MASK;
if (dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac)
if (dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac) {
dev_priv->vram_sys_base = nv_rd32(dev, 0x100e10);
dev_priv->vram_sys_base <<= 12;
}
}

NV_INFO(dev, "Detected %dMiB VRAM\n", (int)(dev_priv->vram_size >> 20));
Expand Down

0 comments on commit ffb19e9

Please sign in to comment.