diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-13 17:00:31 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-13 17:00:31 +0800 |
| commit | 80d0018bc078d489f509152673c838be3c471854 (patch) | |
| tree | d9a5ed283ddd2d0adef59d2d4393b82cb0fc05e6 /shared-core/nouveau_drv.h | |
| parent | ab75d50d6ca72615259e4fa857effeb6192c28a9 (diff) | |
| parent | a90c2854a7a71953e03d36b1ff7db3e9c2babb99 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'shared-core/nouveau_drv.h')
| -rw-r--r-- | shared-core/nouveau_drv.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h index c3d19bb0..c27c93ea 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; @@ -190,11 +191,14 @@ extern int nouveau_fifo_id_get(drm_device_t *dev, DRMFILE filp); 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 void nouveau_object_cleanup(drm_device_t *dev, int channel); 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); |