aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2010-10-15 22:22:59 +0200
committerBen Skeggs <bskeggs@redhat.com>2010-11-18 14:38:36 +1000
commit3c29f9e74591d2f365b159cf59193b19a2f65640 (patch)
tree8e0e9f65b886525217d7fb7e35743e6db3077512 /drivers/gpu
parent2a56a0b913a8d7314c2c10fdd57d667b599232b4 (diff)
downloadkernel_samsung_smdk4412-3c29f9e74591d2f365b159cf59193b19a2f65640.zip
kernel_samsung_smdk4412-3c29f9e74591d2f365b159cf59193b19a2f65640.tar.gz
kernel_samsung_smdk4412-3c29f9e74591d2f365b159cf59193b19a2f65640.tar.bz2
drm/nouveau: fix nv40 pcie gart size
Nouveau sets the PCIE GART size to 64MiB for all cards before nv50, but nv40 has enough RAMIN space to support 512MiB GART size. This patch fixes this value to make use of this hardware capability. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_sgdma.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 288baca..15f3584 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -224,7 +224,11 @@ nouveau_sgdma_init(struct drm_device *dev)
int i, ret;
if (dev_priv->card_type < NV_50) {
- aper_size = (64 * 1024 * 1024);
+ if(dev_priv->card_type < NV_40) {
+ aper_size = (64 * 1024 * 1024);
+ } else {
+ aper_size = (512 * 1024 * 1024);
+ }
obj_size = (aper_size >> NV_CTXDMA_PAGE_SHIFT) * 4;
obj_size += 8; /* ctxdma header */
} else {