aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-11-14 20:48:33 -0500
committerBen Skeggs <bskeggs@redhat.com>2010-12-21 02:17:14 -0500
commit8984e046153eb1d6b0b24626169f9c6e58232e1b (patch)
treedb0798f608a3f8efc71cd5084a223f0dce1fcac2 /drivers/gpu/drm/nouveau/nouveau_drv.h
parent4c74eb7ff276813ee73943a3756b295675fb2865 (diff)
drm/nvc0: initial vm implementation, use for bar1/bar3 management
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 57da219fb18b..c1e85c4c7ac2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -842,6 +842,9 @@ extern void nv10_mem_put_tile_region(struct drm_device *dev,
842 struct nouveau_fence *fence); 842 struct nouveau_fence *fence);
843extern const struct ttm_mem_type_manager_func nouveau_vram_manager; 843extern const struct ttm_mem_type_manager_func nouveau_vram_manager;
844 844
845/* nvc0_vram.c */
846extern const struct ttm_mem_type_manager_func nvc0_vram_manager;
847
845/* nouveau_notifier.c */ 848/* nouveau_notifier.c */
846extern int nouveau_notifier_init_channel(struct nouveau_channel *); 849extern int nouveau_notifier_init_channel(struct nouveau_channel *);
847extern void nouveau_notifier_takedown_channel(struct nouveau_channel *); 850extern void nouveau_notifier_takedown_channel(struct nouveau_channel *);
@@ -1229,11 +1232,6 @@ extern int nvc0_instmem_init(struct drm_device *);
1229extern void nvc0_instmem_takedown(struct drm_device *); 1232extern void nvc0_instmem_takedown(struct drm_device *);
1230extern int nvc0_instmem_suspend(struct drm_device *); 1233extern int nvc0_instmem_suspend(struct drm_device *);
1231extern void nvc0_instmem_resume(struct drm_device *); 1234extern void nvc0_instmem_resume(struct drm_device *);
1232extern int nvc0_instmem_get(struct nouveau_gpuobj *, u32 size, u32 align);
1233extern void nvc0_instmem_put(struct nouveau_gpuobj *);
1234extern int nvc0_instmem_map(struct nouveau_gpuobj *);
1235extern void nvc0_instmem_unmap(struct nouveau_gpuobj *);
1236extern void nvc0_instmem_flush(struct drm_device *);
1237 1235
1238/* nv04_mc.c */ 1236/* nv04_mc.c */
1239extern int nv04_mc_init(struct drm_device *); 1237extern int nv04_mc_init(struct drm_device *);