diff options
| author |   Dave Airlie <airlied@starflyer.(none)> | 2005-07-10 14:34:13 +1000 |
|---|---|---|
| committer |   Dave Airlie <airlied@linux.ie> | 2005-07-10 14:34:13 +1000 |
| commit | 2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3 (patch) | |
| tree | 6602c6a936254ae1175073fdd3f800ed67730c17 /drivers/char/drm/drm_vm.c | |
| parent | drm: fix stupid missing semicolon. (diff) | |
| download | linux-dev-2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3.tar.xz linux-dev-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_vm.c')
| -rw-r--r-- | drivers/char/drm/drm_vm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 621220f3f372..644ec9dadc05 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c @@ -228,6 +228,10 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) 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); } @@ -645,6 +649,9 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma) vma->vm_ops = &drm_vm_ops; break; case _DRM_SHM: + case _DRM_CONSISTENT: + /* Consistent memory is really like shared memory. It's only + * allocate in a different way */ vma->vm_ops = &drm_vm_shm_ops; vma->vm_private_data = (void *)map; /* Don't let this area swap. Change when |