diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-13 16:14:25 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:12:49 +1000 |
| commit | af7afbd2e1409168698bde2f2846848b07d05d12 (patch) | |
| tree | 7d5bcd5f71b17fdf06b365b0f8b86b560df663d4 /drivers/gpu/drm/nouveau/nouveau_drv.h | |
| parent | 861d21074bbb141b0cc165a61c11f571571cda12 (diff) | |
| download | linux-3.10-af7afbd2e1409168698bde2f2846848b07d05d12.tar.gz linux-3.10-af7afbd2e1409168698bde2f2846848b07d05d12.tar.bz2 linux-3.10-af7afbd2e1409168698bde2f2846848b07d05d12.zip | |
drm/nv04-nv40/instmem: duplicate nv04 code as nv40, remove alternate paths
A ton of duplication for the moment, will go away when they become subdevs.
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.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index c7bc6ecad60..ca88403be3f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -1072,6 +1072,18 @@ extern int nv04_instmem_map(struct nouveau_gpuobj *); extern void nv04_instmem_unmap(struct nouveau_gpuobj *); extern void nv04_instmem_flush(struct drm_device *); +/* nv40_instmem.c */ +extern int nv40_instmem_init(struct drm_device *); +extern void nv40_instmem_takedown(struct drm_device *); +extern int nv40_instmem_suspend(struct drm_device *); +extern void nv40_instmem_resume(struct drm_device *); +extern int nv40_instmem_get(struct nouveau_gpuobj *, struct nouveau_channel *, + u32 size, u32 align); +extern void nv40_instmem_put(struct nouveau_gpuobj *); +extern int nv40_instmem_map(struct nouveau_gpuobj *); +extern void nv40_instmem_unmap(struct nouveau_gpuobj *); +extern void nv40_instmem_flush(struct drm_device *); + /* nv50_instmem.c */ extern int nv50_instmem_init(struct drm_device *); extern void nv50_instmem_takedown(struct drm_device *); |