summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2003-04-07 21:57:04 +0000
committerIan Romanick <idr@us.ibm.com>2003-04-07 21:57:04 +0000
commit035c08adca4c157970c5142da1a63cb06819df1b (patch)
tree2450b2af2a3c21dfcc652e4bd82a49de2c4899fc
parentbf3ca5fc8bee5c8e6744660a54cc7910041b0943 (diff)
"Final" round of trunk-to-branch merges.texmem-0-0-1-20030407
-rw-r--r--linux-core/drm_proc.c8
-rw-r--r--linux/drm_proc.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c
index 510df6722..8524d2048 100644
--- a/linux-core/drm_proc.c
+++ b/linux-core/drm_proc.c
@@ -169,9 +169,9 @@ static int DRM(_vm_info)(char *buf, char **start, off_t offset, int request,
struct list_head *list;
/* Hardcoded from _DRM_FRAME_BUFFER,
- _DRM_REGISTERS, _DRM_SHM, and
- _DRM_AGP. */
- const char *types[] = { "FB", "REG", "SHM", "AGP" };
+ _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
+ _DRM_SCATTER_GATHER. */
+ const char *types[] = { "FB", "REG", "SHM", "AGP", "SG" };
const char *type;
int i;
@@ -190,7 +190,7 @@ static int DRM(_vm_info)(char *buf, char **start, off_t offset, int request,
r_list = (drm_map_list_t *)list;
map = r_list->map;
if(!map) continue;
- if (map->type < 0 || map->type > 3) type = "??";
+ if (map->type < 0 || map->type > 4) type = "??";
else type = types[map->type];
DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ",
i,
diff --git a/linux/drm_proc.h b/linux/drm_proc.h
index 510df6722..8524d2048 100644
--- a/linux/drm_proc.h
+++ b/linux/drm_proc.h
@@ -169,9 +169,9 @@ static int DRM(_vm_info)(char *buf, char **start, off_t offset, int request,
struct list_head *list;
/* Hardcoded from _DRM_FRAME_BUFFER,
- _DRM_REGISTERS, _DRM_SHM, and
- _DRM_AGP. */
- const char *types[] = { "FB", "REG", "SHM", "AGP" };
+ _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
+ _DRM_SCATTER_GATHER. */
+ const char *types[] = { "FB", "REG", "SHM", "AGP", "SG" };
const char *type;
int i;
@@ -190,7 +190,7 @@ static int DRM(_vm_info)(char *buf, char **start, off_t offset, int request,
r_list = (drm_map_list_t *)list;
map = r_list->map;
if(!map) continue;
- if (map->type < 0 || map->type > 3) type = "??";
+ if (map->type < 0 || map->type > 4) type = "??";
else type = types[map->type];
DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ",
i,