summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-20 16:31:15 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-20 16:31:15 +0200
commitfa511a3ff5150d932fd963594d1ef67a94bb8b1f (patch)
treebda4ce612c43e638777a53a7b549482e751a4876 /linux-core
parentaac918e7c72a46a1b0f2329380e2d6b4196d04e4 (diff)
Allow for 64-bit map handles of ttms and buffer objects.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drmP.h2
-rw-r--r--linux-core/drm_proc.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 1d0b97ae..91be9d17 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -538,7 +538,7 @@ typedef struct drm_map_list {
struct list_head head; /**< list head */
drm_hash_item_t hash;
drm_map_t *map; /**< mapping */
- unsigned int user_token;
+ drm_u64_t user_token;
} drm_map_list_t;
typedef drm_map_t drm_local_map_t;
diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c
index 512a8f75..2efade26 100644
--- a/linux-core/drm_proc.c
+++ b/linux-core/drm_proc.c
@@ -238,10 +238,11 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request,
type = "??";
else
type = types[map->type];
- DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08x ",
+ DRM_PROC_PRINT("%4d 0x%16lx 0x%16lx %4.4s 0x%02x 0x%16lx ",
i,
map->offset,
- map->size, type, map->flags, r_list->user_token);
+ map->size, type, map->flags,
+ (unsigned long) r_list->user_token);
if (map->mtrr < 0) {
DRM_PROC_PRINT("none\n");