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_proc.c | |
| parent | f179bc77d09b9087bfc559d0368bba350342ac76 (diff) | |
| download | linux-2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3.tar.gz linux-2d0f9eaff8e1d08b9707f5d24fe6b0ac95d231e3.tar.bz2 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_proc.c')
| -rw-r--r-- | drivers/char/drm/drm_proc.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c index 4774087d2e9e..f4154cc71abb 100644 --- a/drivers/char/drm/drm_proc.c +++ b/drivers/char/drm/drm_proc.c @@ -210,8 +210,8 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request, /* Hardcoded from _DRM_FRAME_BUFFER, _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and - _DRM_SCATTER_GATHER. */ - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG" }; + _DRM_SCATTER_GATHER and _DRM_CONSISTENT */ + const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" }; const char *type; int i; @@ -229,9 +229,12 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request, if (dev->maplist != NULL) list_for_each(list, &dev->maplist->head) { r_list = list_entry(list, drm_map_list_t, head); map = r_list->map; - if(!map) continue; - if (map->type < 0 || map->type > 4) type = "??"; - else type = types[map->type]; + if(!map) + continue; + if (map->type < 0 || map->type > 5) + type = "??"; + else + type = types[map->type]; DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ", i, map->offset, |