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 /bsd-core/drm_bufs.c | |
| parent | 93e8c201afac565942f9d3523ac808d3220d6d0e (diff) | |
Merged drmfntbl-0-0-1
Diffstat (limited to 'bsd-core/drm_bufs.c')
| -rw-r--r-- | bsd-core/drm_bufs.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/bsd-core/drm_bufs.c b/bsd-core/drm_bufs.c index d5beb3be..d27254c2 100644 --- a/bsd-core/drm_bufs.c +++ b/bsd-core/drm_bufs.c @@ -40,17 +40,6 @@ #define __HAVE_SG 0 #endif -#ifndef DRIVER_BUF_PRIV_T -#define DRIVER_BUF_PRIV_T u32 -#endif -#ifndef DRIVER_AGP_BUFFERS_MAP -#if __HAVE_AGP && __HAVE_DMA -#error "You must define DRIVER_AGP_BUFFERS_MAP()" -#else -#define DRIVER_AGP_BUFFERS_MAP( dev ) NULL -#endif -#endif - /* * Compute order. Can be made faster. */ @@ -111,7 +100,7 @@ int DRM(addmap)( DRM_IOCTL_ARGS ) switch ( map->type ) { case _DRM_REGISTERS: - DRM_IOREMAP(map, dev); + drm_core_ioremap(map, dev); if (!(map->flags & _DRM_WRITE_COMBINING)) break; /* FALLTHROUGH */ @@ -353,7 +342,7 @@ static int DRM(addbufs_agp)(drm_device_t *dev, drm_buf_desc_t *request) buf->pending = 0; buf->filp = NULL; - buf->dev_priv_size = sizeof(DRIVER_BUF_PRIV_T); + buf->dev_priv_size = dev->dev_priv_size; buf->dev_private = DRM(calloc)(1, buf->dev_priv_size, DRM_MEM_BUFS); if (buf->dev_private == NULL) { @@ -512,8 +501,8 @@ static int DRM(addbufs_pci)(drm_device_t *dev, drm_buf_desc_t *request) buf->pending = 0; buf->filp = NULL; - buf->dev_priv_size = sizeof(DRIVER_BUF_PRIV_T); - buf->dev_private = DRM(alloc)(sizeof(DRIVER_BUF_PRIV_T), + buf->dev_priv_size = dev->dev_priv_size; + buf->dev_private = DRM(alloc)(buf->dev_priv_size, DRM_MEM_BUFS); if (buf->dev_private == NULL) { /* Set count correctly so we free the proper amount. */ @@ -636,7 +625,7 @@ static int DRM(addbufs_sg)(drm_device_t *dev, drm_buf_desc_t *request) buf->pending = 0; buf->filp = NULL; - buf->dev_priv_size = sizeof(DRIVER_BUF_PRIV_T); + buf->dev_priv_size = dev->dev_priv_size; buf->dev_private = DRM(calloc)(1, buf->dev_priv_size, DRM_MEM_BUFS); if (buf->dev_private == NULL) { @@ -907,7 +896,7 @@ int DRM(mapbufs)( DRM_IOCTL_ARGS ) if ((__HAVE_AGP && (dma->flags & _DRM_DMA_USE_AGP)) || (__HAVE_SG && (dma->flags & _DRM_DMA_USE_SG))) { - drm_local_map_t *map = DRIVER_AGP_BUFFERS_MAP(dev); + drm_local_map_t *map = dev->agp_buffer_map; if (map == NULL) { retcode = EINVAL; |