lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm: add _DRM_CONSISTENT map type

Browse Source 
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>
This commit is contained in:
Dave Airlie
2005-07-10 14:34:13 +10:00
committed by Dave Airlie
parent f179bc77d0
commit 2d0f9eaff8
5 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/char/drm/drm_bufs.c
View File

@@ -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);
}