aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-11-01 18:08:26 +0100
committerBen Skeggs <bskeggs@redhat.com>2010-11-18 14:38:57 +1000
commit9d5a6c4353eeac1e0095e731a0a746254f23af83 (patch)
treee22ca855a5875a1f2799dee834a3e429f7cef4d3 /drivers/gpu
parentdd661e5f4e87609e7a9b4cbdff305dca7f494e7b (diff)
downloadkernel_samsung_smdk4412-9d5a6c4353eeac1e0095e731a0a746254f23af83.zip
kernel_samsung_smdk4412-9d5a6c4353eeac1e0095e731a0a746254f23af83.tar.gz
kernel_samsung_smdk4412-9d5a6c4353eeac1e0095e731a0a746254f23af83.tar.bz2
drm/nouveau: Make PCIE GART size depend on the available RAMIN space.
Reported-by: Tomas Miljenovic <tomasmiljenovic@gmail.com> 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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 0b309c1..d4ac970 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -224,11 +224,11 @@ nouveau_sgdma_init(struct drm_device *dev)
int i, ret;
if (dev_priv->card_type < NV_50) {
- if(dev_priv->card_type < NV_40) {
- aper_size = (64 * 1024 * 1024);
- } else {
- aper_size = (512 * 1024 * 1024);
- }
+ if(dev_priv->ramin_rsvd_vram < 2 * 1024 * 1024)
+ 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 {