geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow for 64-bit map handles of ttms and buffer objects.

main
Thomas Hellstrom 2006-09-20 16:31:15 +02:00
parent aac918e7c7
commit fa511a3ff5
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libdrm/xf86mm.h
View File

@ -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;

2
linux-core/drmP.h
View File

@ -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;

5
linux-core/drm_proc.c
View File

@ -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");

4
shared-core/drm.h
View File

@ -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;