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>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 506c508b7eda..29ededdee980 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -62,14 +62,13 @@ nouveau_gem_object_del(struct drm_gem_object *gem)
 int
 nouveau_gem_new(struct drm_device *dev, struct nouveau_channel *chan,
                 int size, int align, uint32_t flags, uint32_t tile_mode,
-                uint32_t tile_flags, bool no_vm, bool mappable,
-                struct nouveau_bo **pnvbo)
+                uint32_t tile_flags, struct nouveau_bo **pnvbo)
 {
         struct nouveau_bo *nvbo;
         int ret;
 
         ret = nouveau_bo_new(dev, chan, size, align, flags, tile_mode,
-                             tile_flags, no_vm, mappable, pnvbo);
+                             tile_flags, pnvbo);
         if (ret)
                 return ret;
         nvbo = *pnvbo;
@@ -97,7 +96,7 @@ nouveau_gem_info(struct drm_gem_object *gem, struct drm_nouveau_gem_info *rep)
 
         rep->size = nvbo->bo.mem.num_pages << PAGE_SHIFT;
         rep->offset = nvbo->bo.offset;
-        rep->map_handle = nvbo->mappable ? nvbo->bo.addr_space_offset : 0;
+        rep->map_handle = nvbo->bo.addr_space_offset;
         rep->tile_mode = nvbo->tile_mode;
         rep->tile_flags = nvbo->tile_flags;
         return 0;
@@ -136,9 +135,7 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,
         }
 
         ret = nouveau_gem_new(dev, chan, req->info.size, req->align, flags,
-                              req->info.tile_mode, req->info.tile_flags, false,
-                              (req->info.domain & NOUVEAU_GEM_DOMAIN_MAPPABLE),
-                              &nvbo);
+                              req->info.tile_mode, req->info.tile_flags, &nvbo);
         if (chan)
                 nouveau_channel_put(&chan);
         if (ret)