diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-03-08 14:47:53 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-03-14 16:35:16 +1000 |
| commit | 459ca7e5283914845d7139905ff58824d2b0cc85 (patch) | |
| tree | bd54b1201351f7fc5742f5b0b024ac2866cd3a3f /drivers/gpu/drm/nouveau/nouveau_sgdma.c | |
| parent | 6fdb383e81a644a244299d635de5eb30ed401278 (diff) | |
| download | op-kernel-dev-459ca7e5283914845d7139905ff58824d2b0cc85.zip op-kernel-dev-459ca7e5283914845d7139905ff58824d2b0cc85.tar.gz | |
drm/nv40: attempt to reserve just enough vram for all 32 channels
This also makes the fact we're giving 512MiB of GART space to all PCIE
boards explicit, although the vast majority (if not all) of them will
now have a ramin_rsvd_vram larger than 2MiB anyway.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_sgdma.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sgdma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index 1205f0f..a33fe40 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c @@ -427,8 +427,7 @@ nouveau_sgdma_init(struct drm_device *dev) u32 aper_size, align; int ret; - if (dev_priv->card_type >= NV_50 || - dev_priv->ramin_rsvd_vram >= 2 * 1024 * 1024) + if (dev_priv->card_type >= NV_50 || drm_pci_device_is_pcie(dev)) aper_size = 512 * 1024 * 1024; else aper_size = 64 * 1024 * 1024; |
