summaryrefslogtreecommitdiff
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
parentaac918e7c72a46a1b0f2329380e2d6b4196d04e4 (diff)
Allow for 64-bit map handles of ttms and buffer objects.
-rw-r--r--libdrm/xf86mm.h4
-rw-r--r--linux-core/drmP.h2
-rw-r--r--linux-core/drm_proc.c5
-rw-r--r--shared-core/drm.h4
4 files changed, 8 insertions, 7 deletions
diff --git a/libdrm/xf86mm.h b/libdrm/xf86mm.h
index a62aef47..c0e4f1b6 100644
--- a/libdrm/xf86mm.h
+++ b/libdrm/xf86mm.h
@@ -103,7 +103,7 @@ typedef struct _drmFence{
typedef struct _drmTTM{
unsigned handle;
- drm_handle_t user_token;
+ drm_u64_t user_token;
unsigned flags;
unsigned long size;
void *virtual;
@@ -113,7 +113,7 @@ typedef struct _drmTTM{
typedef struct _drmBO{
drm_bo_type_t type;
unsigned handle;
- drm_handle_t mapHandle;
+ drm_u64_t mapHandle;
unsigned flags;
unsigned mask;
unsigned mapFlags;
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");
diff --git a/shared-core/drm.h b/shared-core/drm.h
index b4dd61cb..8ac5a31e 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -677,7 +677,7 @@ typedef struct drm_ttm_arg {
drm_ttm_unreference
} op;
unsigned handle;
- unsigned user_token;
+ drm_u64_t user_token;
drm_u64_t size;
unsigned flags;
}drm_ttm_arg_t;
@@ -781,7 +781,7 @@ typedef struct drm_bo_arg_reply {
unsigned flags;
drm_u64_t size;
drm_u64_t offset;
- unsigned arg_handle;
+ drm_u64_t arg_handle;
unsigned mask;
drm_u64_t buffer_start;
unsigned fence_flags;