diff options
author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-06-17 09:09:09 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-06-30 23:50:43 -0400 |
commit | 79442c3af0525e81d4598e272abe5db60c489c62 (patch) | |
tree | bc3ccbe8d7e1de908556278cbabec261382de434 | |
parent | 36798b61ed799962e08d49a632fee94b5177d4ac (diff) |
drm/nouveau: remove limit on gart
Most graphics cards nowadays have a multiple of this limit as their vram,
so limiting GART doesn't seem to make much sense.
Signed-off-by: Maarten >Lnkhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ttm.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index 01e3154f8969..d0382f7e86c8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c | |||
@@ -168,9 +168,6 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man, | |||
168 | struct nouveau_bo *nvbo = nouveau_bo(bo); | 168 | struct nouveau_bo *nvbo = nouveau_bo(bo); |
169 | struct nouveau_mem *node; | 169 | struct nouveau_mem *node; |
170 | 170 | ||
171 | if (unlikely((mem->num_pages << PAGE_SHIFT) >= 512 * 1024 * 1024)) | ||
172 | return -ENOMEM; | ||
173 | |||
174 | node = kzalloc(sizeof(*node), GFP_KERNEL); | 171 | node = kzalloc(sizeof(*node), GFP_KERNEL); |
175 | if (!node) | 172 | if (!node) |
176 | return -ENOMEM; | 173 | return -ENOMEM; |
@@ -403,8 +400,6 @@ nouveau_ttm_init(struct nouveau_drm *drm) | |||
403 | /* GART init */ | 400 | /* GART init */ |
404 | if (drm->agp.stat != ENABLED) { | 401 | if (drm->agp.stat != ENABLED) { |
405 | drm->gem.gart_available = nouveau_vmmgr(drm->device)->limit; | 402 | drm->gem.gart_available = nouveau_vmmgr(drm->device)->limit; |
406 | if (drm->gem.gart_available > 512 * 1024 * 1024) | ||
407 | drm->gem.gart_available = 512 * 1024 * 1024; | ||
408 | } else { | 403 | } else { |
409 | drm->gem.gart_available = drm->agp.size; | 404 | drm->gem.gart_available = drm->agp.size; |
410 | } | 405 | } |