diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-08-17 13:10:05 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-08-17 13:10:05 +0000 |
| commit | 5c9ed8309493acb099463d25b32fabb5b7c004af (patch) | |
| tree | eec5be6f9374b5a2f61d52bd02ba0a44ba7e636d /linux/i830_dma.c | |
| parent | 93e8c201afac565942f9d3523ac808d3220d6d0e (diff) | |
Merged drmfntbl-0-0-1
Diffstat (limited to 'linux/i830_dma.c')
| -rw-r--r-- | linux/i830_dma.c | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/linux/i830_dma.c b/linux/i830_dma.c index 55bf1b72..1a8c6336 100644 --- a/linux/i830_dma.c +++ b/linux/i830_dma.c @@ -378,15 +378,15 @@ static int i830_dma_initialize(drm_device_t *dev, DRM_ERROR("can not find sarea!\n"); return -EINVAL; } - DRM_FIND_MAP( dev_priv->mmio_map, init->mmio_offset ); + dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset); if(!dev_priv->mmio_map) { dev->dev_private = (void *)dev_priv; i830_dma_cleanup(dev); DRM_ERROR("can not find mmio map!\n"); return -EINVAL; } - DRM_FIND_MAP( dev_priv->buffer_map, init->buffers_offset ); - if(!dev_priv->buffer_map) { + dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset); + if(!dev->agp_buffer_map) { dev->dev_private = (void *)dev_priv; i830_dma_cleanup(dev); DRM_ERROR("can not find dma buffer map!\n"); @@ -1589,3 +1589,29 @@ int i830_setparam( struct inode *inode, struct file *filp, unsigned int cmd, return 0; } + + +static void i830_driver_pretakedown(drm_device_t *dev) +{ + i830_dma_cleanup( dev ); +} + +static void i830_driver_release(drm_device_t *dev, struct file *filp) +{ + i830_reclaim_buffers(filp); +} + +static int i830_driver_dma_quiescent(drm_device_t *dev) +{ + i830_dma_quiescent( dev ); + return 0; +} + +void i830_driver_register_fns(drm_device_t *dev) +{ + dev->dev_priv_size = sizeof(drm_i830_buf_priv_t); + dev->fn_tbl.pretakedown = i830_driver_pretakedown; + dev->fn_tbl.release = i830_driver_release; + dev->fn_tbl.dma_quiescent = i830_driver_dma_quiescent; +} + |