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, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 1ede35491f54..634d222c93de 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -693,6 +693,9 @@ struct drm_nouveau_private {
693 struct ttm_bo_global_ref bo_global_ref; 693 struct ttm_bo_global_ref bo_global_ref;
694 struct ttm_bo_device bdev; 694 struct ttm_bo_device bdev;
695 atomic_t validate_sequence; 695 atomic_t validate_sequence;
696 int (*move)(struct nouveau_channel *,
697 struct ttm_buffer_object *,
698 struct ttm_mem_reg *, struct ttm_mem_reg *);
696 } ttm; 699 } ttm;
697 700
698 struct { 701 struct {
@@ -930,7 +933,7 @@ extern void nouveau_channel_put_unlocked(struct nouveau_channel **);
930extern void nouveau_channel_put(struct nouveau_channel **); 933extern void nouveau_channel_put(struct nouveau_channel **);
931extern void nouveau_channel_ref(struct nouveau_channel *chan, 934extern void nouveau_channel_ref(struct nouveau_channel *chan,
932 struct nouveau_channel **pchan); 935 struct nouveau_channel **pchan);
933extern void nouveau_channel_idle(struct nouveau_channel *chan); 936extern int nouveau_channel_idle(struct nouveau_channel *chan);
934 937
935/* nouveau_object.c */ 938/* nouveau_object.c */
936#define NVOBJ_ENGINE_ADD(d, e, p) do { \ 939#define NVOBJ_ENGINE_ADD(d, e, p) do { \
@@ -1322,6 +1325,7 @@ extern int nv04_crtc_create(struct drm_device *, int index);
1322 1325
1323/* nouveau_bo.c */ 1326/* nouveau_bo.c */
1324extern struct ttm_bo_driver nouveau_bo_driver; 1327extern struct ttm_bo_driver nouveau_bo_driver;
1328extern void nouveau_bo_move_init(struct nouveau_channel *);
1325extern int nouveau_bo_new(struct drm_device *, int size, int align, 1329extern int nouveau_bo_new(struct drm_device *, int size, int align,
1326 uint32_t flags, uint32_t tile_mode, 1330 uint32_t flags, uint32_t tile_mode,
1327 uint32_t tile_flags, 1331 uint32_t tile_flags,