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

drm: remove ttm userspace typedefs

main
Dave Airlie 2007-07-16 11:30:53 +10:00
parent b95ac8b7b3
commit 1a07256d60
4 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-core/drm_bo.c
View File

@ -1589,7 +1589,7 @@ static int drm_bo_handle_wait(drm_file_t *priv, uint32_t handle,
int drm_buffer_object_create(drm_device_t *dev, int drm_buffer_object_create(drm_device_t *dev,
unsigned long size, unsigned long size,
drm_bo_type_t type, enum drm_bo_type type,
uint64_t mask, uint64_t mask,
uint32_t hint, uint32_t hint,
uint32_t page_alignment, uint32_t page_alignment,

18
linux-core/drm_fence.c
View File

@ -570,7 +570,7 @@ int drm_fence_create_ioctl(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
int ret; int ret;
drm_fence_manager_t *fm = &dev->fm; drm_fence_manager_t *fm = &dev->fm;
drm_fence_arg_t arg; struct drm_fence_arg arg;
drm_fence_object_t *fence; drm_fence_object_t *fence;
unsigned long flags; unsigned long flags;
ret = 0; ret = 0;
@ -618,7 +618,7 @@ int drm_fence_destroy_ioctl(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
int ret; int ret;
drm_fence_manager_t *fm = &dev->fm; drm_fence_manager_t *fm = &dev->fm;
drm_fence_arg_t arg; struct drm_fence_arg arg;
drm_user_object_t *uo; drm_user_object_t *uo;
ret = 0; ret = 0;
@ -646,7 +646,7 @@ int drm_fence_reference_ioctl(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
int ret; int ret;
drm_fence_manager_t *fm = &dev->fm; drm_fence_manager_t *fm = &dev->fm;
drm_fence_arg_t arg; struct drm_fence_arg arg;
drm_fence_object_t *fence; drm_fence_object_t *fence;
drm_user_object_t *uo; drm_user_object_t *uo;
unsigned long flags; unsigned long flags;
@ -680,7 +680,7 @@ int drm_fence_unreference_ioctl(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
int ret; int ret;
drm_fence_manager_t *fm = &dev->fm; drm_fence_manager_t *fm = &dev->fm;
drm_fence_arg_t arg; struct drm_fence_arg arg;
ret = 0; ret = 0;
if (!fm->initialized) { if (!fm->initialized) {
@ -697,7 +697,7 @@ int drm_fence_signaled_ioctl(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
int ret; int ret;
drm_fence_manager_t *fm = &dev->fm; drm_fence_manager_t *fm = &dev->fm;
drm_fence_arg_t arg; struct drm_fence_arg arg;
drm_fence_object_t *fence; drm_fence_object_t *fence;
unsigned long flags; unsigned long flags;
ret = 0; ret = 0;
@ -729,7 +729,7 @@ int drm_fence_flush_ioctl(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
int ret; int ret;
drm_fence_manager_t *fm = &dev->fm; drm_fence_manager_t *fm = &dev->fm;
drm_fence_arg_t arg; struct drm_fence_arg arg;
drm_fence_object_t *fence; drm_fence_object_t *fence;
unsigned long flags; unsigned long flags;
ret = 0; ret = 0;
@ -763,7 +763,7 @@ int drm_fence_wait_ioctl(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
int ret; int ret;
drm_fence_manager_t *fm = &dev->fm; drm_fence_manager_t *fm = &dev->fm;
drm_fence_arg_t arg; struct drm_fence_arg arg;
drm_fence_object_t *fence; drm_fence_object_t *fence;
unsigned long flags; unsigned long flags;
ret = 0; ret = 0;
@ -799,7 +799,7 @@ int drm_fence_emit_ioctl(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
int ret; int ret;
drm_fence_manager_t *fm = &dev->fm; drm_fence_manager_t *fm = &dev->fm;
drm_fence_arg_t arg; struct drm_fence_arg arg;
drm_fence_object_t *fence; drm_fence_object_t *fence;
unsigned long flags; unsigned long flags;
ret = 0; ret = 0;
@ -834,7 +834,7 @@ int drm_fence_buffers_ioctl(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
int ret; int ret;
drm_fence_manager_t *fm = &dev->fm; drm_fence_manager_t *fm = &dev->fm;
drm_fence_arg_t arg; struct drm_fence_arg arg;
drm_fence_object_t *fence; drm_fence_object_t *fence;
unsigned long flags; unsigned long flags;
ret = 0; ret = 0;

2
linux-core/drm_objects.h
View File

@ -337,7 +337,7 @@ typedef struct drm_buffer_object {
atomic_t usage; atomic_t usage;
unsigned long buffer_start; unsigned long buffer_start;
drm_bo_type_t type; enum drm_bo_type type;
unsigned long offset; unsigned long offset;
atomic_t mapped; atomic_t mapped;
drm_bo_mem_reg_t mem; drm_bo_mem_reg_t mem;

49
shared-core/drm.h
View File

@ -670,7 +670,7 @@ struct drm_set_version {
#define DRM_FENCE_TYPE_EXE 0x00000001 #define DRM_FENCE_TYPE_EXE 0x00000001
typedef struct drm_fence_arg { struct drm_fence_arg {
unsigned int handle; unsigned int handle;
unsigned int class; unsigned int class;
unsigned int type; unsigned int type;
@ -678,7 +678,7 @@ typedef struct drm_fence_arg {
unsigned int signaled; unsigned int signaled;
unsigned int pad64; unsigned int pad64;
drm_u64_t expand_pad[3]; /*Future expansion */ drm_u64_t expand_pad[3]; /*Future expansion */
} drm_fence_arg_t; };
/* Buffer permissions, referring to how the GPU uses the buffers. /* Buffer permissions, referring to how the GPU uses the buffers.
* these translate to fence types used for the buffers. * these translate to fence types used for the buffers.
@ -784,12 +784,12 @@ typedef struct drm_fence_arg {
#define DRM_BO_INIT_MINOR 1 #define DRM_BO_INIT_MINOR 1
typedef enum { enum drm_bo_type {
drm_bo_type_dc, drm_bo_type_dc,
drm_bo_type_user, drm_bo_type_user,
drm_bo_type_fake, drm_bo_type_fake,
drm_bo_type_kernel, /* for initial kernel allocations */ drm_bo_type_kernel, /* for initial kernel allocations */
}drm_bo_type_t; };
struct drm_bo_info_req { struct drm_bo_info_req {
drm_u64_t mask; drm_u64_t mask;
@ -806,7 +806,7 @@ struct drm_bo_create_req {
drm_u64_t buffer_start; drm_u64_t buffer_start;
unsigned int hint; unsigned int hint;
unsigned int page_alignment; unsigned int page_alignment;
drm_bo_type_t type; enum drm_bo_type type;
unsigned int pad64; unsigned int pad64;
}; };
@ -896,18 +896,18 @@ struct drm_bo_op_arg {
#define DRM_BO_MEM_TYPES 8 /* For now. */ #define DRM_BO_MEM_TYPES 8 /* For now. */
typedef struct drm_mm_type_arg { struct drm_mm_type_arg {
unsigned int mem_type; unsigned int mem_type;
} drm_mm_type_arg_t; };
typedef struct drm_mm_init_arg { struct drm_mm_init_arg {
unsigned int magic; unsigned int magic;
unsigned int major; unsigned int major;
unsigned int minor; unsigned int minor;
unsigned int mem_type; unsigned int mem_type;
drm_u64_t p_offset; drm_u64_t p_offset;
drm_u64_t p_size; drm_u64_t p_size;
} drm_mm_init_arg_t; };
/** /**
* \name Ioctls Definitions * \name Ioctls Definitions
@ -976,20 +976,20 @@ typedef struct drm_mm_init_arg {
#define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, struct drm_update_draw) #define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, struct drm_update_draw)
#define DRM_IOCTL_MM_INIT DRM_IOWR(0xc0, drm_mm_init_arg_t) #define DRM_IOCTL_MM_INIT DRM_IOWR(0xc0, struct drm_mm_init_arg)
#define DRM_IOCTL_MM_TAKEDOWN DRM_IOWR(0xc1, drm_mm_type_arg_t) #define DRM_IOCTL_MM_TAKEDOWN DRM_IOWR(0xc1, struct drm_mm_type_arg)
#define DRM_IOCTL_MM_LOCK DRM_IOWR(0xc2, drm_mm_type_arg_t) #define DRM_IOCTL_MM_LOCK DRM_IOWR(0xc2, struct drm_mm_type_arg)
#define DRM_IOCTL_MM_UNLOCK DRM_IOWR(0xc3, drm_mm_type_arg_t) #define DRM_IOCTL_MM_UNLOCK DRM_IOWR(0xc3, struct drm_mm_type_arg)
#define DRM_IOCTL_FENCE_CREATE DRM_IOWR(0xc4, drm_fence_arg_t) #define DRM_IOCTL_FENCE_CREATE DRM_IOWR(0xc4, struct drm_fence_arg)
#define DRM_IOCTL_FENCE_DESTROY DRM_IOWR(0xc5, drm_fence_arg_t) #define DRM_IOCTL_FENCE_DESTROY DRM_IOWR(0xc5, struct drm_fence_arg)
#define DRM_IOCTL_FENCE_REFERENCE DRM_IOWR(0xc6, drm_fence_arg_t) #define DRM_IOCTL_FENCE_REFERENCE DRM_IOWR(0xc6, struct drm_fence_arg)
#define DRM_IOCTL_FENCE_UNREFERENCE DRM_IOWR(0xc7, drm_fence_arg_t) #define DRM_IOCTL_FENCE_UNREFERENCE DRM_IOWR(0xc7, struct drm_fence_arg)
#define DRM_IOCTL_FENCE_SIGNALED DRM_IOWR(0xc8, drm_fence_arg_t) #define DRM_IOCTL_FENCE_SIGNALED DRM_IOWR(0xc8, struct drm_fence_arg)
#define DRM_IOCTL_FENCE_FLUSH DRM_IOWR(0xc9, drm_fence_arg_t) #define DRM_IOCTL_FENCE_FLUSH DRM_IOWR(0xc9, struct drm_fence_arg)
#define DRM_IOCTL_FENCE_WAIT DRM_IOWR(0xca, drm_fence_arg_t) #define DRM_IOCTL_FENCE_WAIT DRM_IOWR(0xca, struct drm_fence_arg)
#define DRM_IOCTL_FENCE_EMIT DRM_IOWR(0xcb, drm_fence_arg_t) #define DRM_IOCTL_FENCE_EMIT DRM_IOWR(0xcb, struct drm_fence_arg)
#define DRM_IOCTL_FENCE_BUFFERS DRM_IOWR(0xcc, drm_fence_arg_t) #define DRM_IOCTL_FENCE_BUFFERS DRM_IOWR(0xcc, struct drm_fence_arg)
#define DRM_IOCTL_BO_CREATE DRM_IOWR(0xcd, struct drm_bo_create_arg) #define DRM_IOCTL_BO_CREATE DRM_IOWR(0xcd, struct drm_bo_create_arg)
#define DRM_IOCTL_BO_DESTROY DRM_IOWR(0xce, struct drm_bo_handle_arg) #define DRM_IOCTL_BO_DESTROY DRM_IOWR(0xce, struct drm_bo_handle_arg)
@ -1057,6 +1057,11 @@ typedef struct drm_agp_binding drm_agp_binding_t;
typedef struct drm_agp_info drm_agp_info_t; typedef struct drm_agp_info drm_agp_info_t;
typedef struct drm_scatter_gather drm_scatter_gather_t; typedef struct drm_scatter_gather drm_scatter_gather_t;
typedef struct drm_set_version drm_set_version_t; typedef struct drm_set_version drm_set_version_t;
typedef struct drm_fence_arg drm_fence_arg_t;
typedef struct drm_mm_type_arg drm_mm_type_arg_t;
typedef struct drm_mm_init_arg drm_mm_init_arg_t;
typedef enum drm_bo_type drm_bo_type_t;
#endif #endif
#endif #endif