aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv50_evo.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-02-15 17:41:56 -0500
committerBen Skeggs <bskeggs@redhat.com>2011-02-24 15:45:34 -0500
commitd550c41e4ff11fe69b5f92868157253d27937d1f (patch)
tree5c51d494f497d6cdffc822964bfeca0ba310ac3d /drivers/gpu/drm/nouveau/nv50_evo.c
parent2503c6fa3edf7c2bb001c7f7926786eed24cc06e (diff)
drm/nouveau: remove no_vm/mappable flags from nouveau_bo
'mappable' isn't really used at all, nor is it necessary anymore as the bo code is capable of moving buffers to mappable vram as required. 'no_vm' isn't necessary anymore either, any places that don't want to be mapped into a GPU address space should allocate the VRAM directly instead. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_evo.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_evo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c
index 18fbf27376c..a2cfaa691e9 100644
--- a/drivers/gpu/drm/nouveau/nv50_evo.c
+++ b/drivers/gpu/drm/nouveau/nv50_evo.c
@@ -117,7 +117,7 @@ nv50_evo_channel_new(struct drm_device *dev, int chid,
117 evo->user_put = 0; 117 evo->user_put = 0;
118 118
119 ret = nouveau_bo_new(dev, NULL, 4096, 0, TTM_PL_FLAG_VRAM, 0, 0, 119 ret = nouveau_bo_new(dev, NULL, 4096, 0, TTM_PL_FLAG_VRAM, 0, 0,
120 false, true, &evo->pushbuf_bo); 120 &evo->pushbuf_bo);
121 if (ret == 0) 121 if (ret == 0)
122 ret = nouveau_bo_pin(evo->pushbuf_bo, TTM_PL_FLAG_VRAM); 122 ret = nouveau_bo_pin(evo->pushbuf_bo, TTM_PL_FLAG_VRAM);
123 if (ret) { 123 if (ret) {
@@ -331,7 +331,7 @@ nv50_evo_create(struct drm_device *dev)
331 goto err; 331 goto err;
332 332
333 ret = nouveau_bo_new(dev, NULL, 4096, 0x1000, TTM_PL_FLAG_VRAM, 333 ret = nouveau_bo_new(dev, NULL, 4096, 0x1000, TTM_PL_FLAG_VRAM,
334 0, 0x0000, false, true, &dispc->sem.bo); 334 0, 0x0000, &dispc->sem.bo);
335 if (!ret) { 335 if (!ret) {
336 offset = dispc->sem.bo->bo.mem.start << PAGE_SHIFT; 336 offset = dispc->sem.bo->bo.mem.start << PAGE_SHIFT;
337 337