aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 8f6491845692..f591c84a2792 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -104,8 +104,6 @@ struct nouveau_bo {
104 struct nouveau_channel *channel; 104 struct nouveau_channel *channel;
105 105
106 struct nouveau_vma vma; 106 struct nouveau_vma vma;
107 bool mappable;
108 bool no_vm;
109 107
110 uint32_t tile_mode; 108 uint32_t tile_mode;
111 uint32_t tile_flags; 109 uint32_t tile_flags;
@@ -1293,7 +1291,7 @@ extern struct ttm_bo_driver nouveau_bo_driver;
1293extern int nouveau_bo_new(struct drm_device *, struct nouveau_channel *, 1291extern int nouveau_bo_new(struct drm_device *, struct nouveau_channel *,
1294 int size, int align, uint32_t flags, 1292 int size, int align, uint32_t flags,
1295 uint32_t tile_mode, uint32_t tile_flags, 1293 uint32_t tile_mode, uint32_t tile_flags,
1296 bool no_vm, bool mappable, struct nouveau_bo **); 1294 struct nouveau_bo **);
1297extern int nouveau_bo_pin(struct nouveau_bo *, uint32_t flags); 1295extern int nouveau_bo_pin(struct nouveau_bo *, uint32_t flags);
1298extern int nouveau_bo_unpin(struct nouveau_bo *); 1296extern int nouveau_bo_unpin(struct nouveau_bo *);
1299extern int nouveau_bo_map(struct nouveau_bo *); 1297extern int nouveau_bo_map(struct nouveau_bo *);
@@ -1356,7 +1354,7 @@ static inline struct nouveau_fence *nouveau_fence_ref(struct nouveau_fence *obj)
1356extern int nouveau_gem_new(struct drm_device *, struct nouveau_channel *, 1354extern int nouveau_gem_new(struct drm_device *, struct nouveau_channel *,
1357 int size, int align, uint32_t flags, 1355 int size, int align, uint32_t flags,
1358 uint32_t tile_mode, uint32_t tile_flags, 1356 uint32_t tile_mode, uint32_t tile_flags,
1359 bool no_vm, bool mappable, struct nouveau_bo **); 1357 struct nouveau_bo **);
1360extern int nouveau_gem_object_new(struct drm_gem_object *); 1358extern int nouveau_gem_object_new(struct drm_gem_object *);
1361extern void nouveau_gem_object_del(struct drm_gem_object *); 1359extern void nouveau_gem_object_del(struct drm_gem_object *);
1362extern int nouveau_gem_ioctl_new(struct drm_device *, void *, 1360extern int nouveau_gem_ioctl_new(struct drm_device *, void *,