diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-06-02 10:12:00 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-13 10:13:01 +1000 |
| commit | 7a2e4e03b77b929b10f3007395128a9870090653 (patch) | |
| tree | 66e0007fd5ad3d66e1ef5fbc20459c23ba275738 /drivers/gpu/drm/nouveau/nouveau_mem.c | |
| parent | fb4f56214dd632d90b8ac64d7781faeb4dd744c7 (diff) | |
| download | kernel_samsung_smdk4412-7a2e4e03b77b929b10f3007395128a9870090653.zip kernel_samsung_smdk4412-7a2e4e03b77b929b10f3007395128a9870090653.tar.gz kernel_samsung_smdk4412-7a2e4e03b77b929b10f3007395128a9870090653.tar.bz2 | |
drm/nv50: fix memory detection for cards with >=4GiB VRAM
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 206bd16..2853ba0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -364,9 +364,14 @@ nouveau_mem_detect(struct drm_device *dev) } else if (dev_priv->flags & (NV_NFORCE | NV_NFORCE2)) { dev_priv->vram_size = nouveau_mem_detect_nforce(dev); - } else { + } else + if (dev_priv->card_type < NV_50) { dev_priv->vram_size = nv_rd32(dev, NV04_FIFO_DATA); dev_priv->vram_size &= NV10_FIFO_DATA_RAM_AMOUNT_MB_MASK; + } else { + dev_priv->vram_size = nv_rd32(dev, NV04_FIFO_DATA); + dev_priv->vram_size |= (dev_priv->vram_size & 0xff) << 32; + dev_priv->vram_size &= 0xffffffff00; if (dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac) { dev_priv->vram_sys_base = nv_rd32(dev, 0x100e10); dev_priv->vram_sys_base <<= 12; |