diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-03-13 14:18:03 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-03-13 14:55:54 +1100 |
| commit | 1775202cf96c51018bf369b1b4d08023d622513c (patch) | |
| tree | 89b74269b4ebeaea34725f46739391b6578c8dbb /shared-core/nouveau_drv.h | |
| parent | 7e2bbe295424adfcd455a4c4b42dd0342087615e (diff) | |
nouveau: associate all created objects with a channel + cleanups
Diffstat (limited to 'shared-core/nouveau_drv.h')
| -rw-r--r-- | shared-core/nouveau_drv.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h index c3d19bb0..a4b05895 100644 --- a/shared-core/nouveau_drv.h +++ b/shared-core/nouveau_drv.h @@ -61,6 +61,7 @@ struct nouveau_object { struct nouveau_object *next; struct nouveau_object *prev; + int channel; struct mem_block *instance; uint32_t ht_loc; @@ -192,9 +193,12 @@ extern void nouveau_fifo_free(drm_device_t *dev, int channel); /* nouveau_object.c */ extern void nouveau_object_cleanup(drm_device_t *dev, DRMFILE filp); extern struct nouveau_object * -nouveau_dma_object_create(drm_device_t *dev, int class, +nouveau_object_gr_create(drm_device_t *dev, int channel, int class); +extern struct nouveau_object * +nouveau_object_dma_create(drm_device_t *dev, int channel, int class, uint32_t offset, uint32_t size, int access, int target); +extern void nouveau_object_free(drm_device_t *dev, struct nouveau_object *obj); extern int nouveau_ioctl_object_init(DRM_IOCTL_ARGS); extern int nouveau_ioctl_dma_object_init(DRM_IOCTL_ARGS); extern uint32_t nouveau_chip_instance_get(drm_device_t *dev, struct mem_block *mem); |