diff options
| author | Dave Airlie | 2005-07-10 06:34:13 +0200 |
|---|---|---|
| committer | Dave Airlie | 2005-07-10 06:34:13 +0200 |
| commit | 2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3 (patch) | |
| tree | 6602c6a936254ae1175073fdd3f800ed67730c17 /drivers/char/drm/drm_bufs.c | |
| parent | drm: fix stupid missing semicolon. (diff) | |
| download | kernel-qcow2-linux-2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3.tar.gz kernel-qcow2-linux-2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3.tar.xz kernel-qcow2-linux-2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3.zip | |
drm: add _DRM_CONSISTENT map type
Added a new DRM map type _DRM_CONSISTENT for consistent PCI memory. It
uses drm_pci_alloc/free for allocating/freeing the memory.
From: Felix Kuhling <fxkuehl@gmx.de>
Signed-off-by: David Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_bufs.c')
| -rw-r--r-- | drivers/char/drm/drm_bufs.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c index 4c6191d231b8..89f301ffd97e 100644 --- a/drivers/char/drm/drm_bufs.c +++ b/drivers/char/drm/drm_bufs.c @@ -180,7 +180,22 @@ int drm_addmap( struct inode *inode, struct file *filp, } map->offset += dev->sg->handle; break; - + case _DRM_CONSISTENT: + { + /* dma_addr_t is 64bit on i386 with CONFIG_HIGHMEM64G, + * As we're limit the address to 2^32-1 (or lses), + * casting it down to 32 bits is no problem, but we + * need to point to a 64bit variable first. */ + dma_addr_t bus_addr; + map->handle = drm_pci_alloc(dev, map->size, map->size, + 0xffffffffUL, &bus_addr); + map->offset = (unsigned long)bus_addr; + if (!map->handle) { + drm_free(map, sizeof(*map), DRM_MEM_MAPS); + return -ENOMEM; + } + break; + } default: drm_free( map, sizeof(*map), DRM_MEM_MAPS ); return -EINVAL; @@ -291,6 +306,9 @@ int drm_rmmap(struct inode *inode, struct file *filp, case _DRM_AGP: case _DRM_SCATTER_GATHER: break; + case _DRM_CONSISTENT: + drm_pci_free(dev, map->size, map->handle, map->offset); + break; } drm_free(map, sizeof(*map), DRM_MEM_MAPS); } |