Commit 8e51012c authored by Mikko Rapeli's avatar Mikko Rapeli Committed by Gabriel Laskar

include/uapi/drm/qxl_drm.h: use __s32, __u32 and __u64 from linux/types.h

Fixes userspace compilation errors like:

error: unknown type name ‘uint32_t’
Signed-off-by: default avatarMikko Rapeli <mikko.rapeli@iki.fi>
parent 21de2fda
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
/* Please note that modifications to all structs defined here are /* Please note that modifications to all structs defined here are
* subject to backwards-compatibility constraints. * subject to backwards-compatibility constraints.
* *
* Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel * Do not use pointers, use __u64 instead for 32 bit / 64 bit user/kernel
* compatibility Keep fields aligned to their size * compatibility Keep fields aligned to their size
*/ */
...@@ -48,14 +48,14 @@ ...@@ -48,14 +48,14 @@
#define DRM_QXL_ALLOC_SURF 0x06 #define DRM_QXL_ALLOC_SURF 0x06
struct drm_qxl_alloc { struct drm_qxl_alloc {
uint32_t size; __u32 size;
uint32_t handle; /* 0 is an invalid handle */ __u32 handle; /* 0 is an invalid handle */
}; };
struct drm_qxl_map { struct drm_qxl_map {
uint64_t offset; /* use for mmap system call */ __u64 offset; /* use for mmap system call */
uint32_t handle; __u32 handle;
uint32_t pad; __u32 pad;
}; };
/* /*
...@@ -68,59 +68,59 @@ struct drm_qxl_map { ...@@ -68,59 +68,59 @@ struct drm_qxl_map {
#define QXL_RELOC_TYPE_SURF 2 #define QXL_RELOC_TYPE_SURF 2
struct drm_qxl_reloc { struct drm_qxl_reloc {
uint64_t src_offset; /* offset into src_handle or src buffer */ __u64 src_offset; /* offset into src_handle or src buffer */
uint64_t dst_offset; /* offset in dest handle */ __u64 dst_offset; /* offset in dest handle */
uint32_t src_handle; /* dest handle to compute address from */ __u32 src_handle; /* dest handle to compute address from */
uint32_t dst_handle; /* 0 if to command buffer */ __u32 dst_handle; /* 0 if to command buffer */
uint32_t reloc_type; __u32 reloc_type;
uint32_t pad; __u32 pad;
}; };
struct drm_qxl_command { struct drm_qxl_command {
uint64_t __user command; /* void* */ __u64 __user command; /* void* */
uint64_t __user relocs; /* struct drm_qxl_reloc* */ __u64 __user relocs; /* struct drm_qxl_reloc* */
uint32_t type; __u32 type;
uint32_t command_size; __u32 command_size;
uint32_t relocs_num; __u32 relocs_num;
uint32_t pad; __u32 pad;
}; };
/* XXX: call it drm_qxl_commands? */ /* XXX: call it drm_qxl_commands? */
struct drm_qxl_execbuffer { struct drm_qxl_execbuffer {
uint32_t flags; /* for future use */ __u32 flags; /* for future use */
uint32_t commands_num; __u32 commands_num;
uint64_t __user commands; /* struct drm_qxl_command* */ __u64 __user commands; /* struct drm_qxl_command* */
}; };
struct drm_qxl_update_area { struct drm_qxl_update_area {
uint32_t handle; __u32 handle;
uint32_t top; __u32 top;
uint32_t left; __u32 left;
uint32_t bottom; __u32 bottom;
uint32_t right; __u32 right;
uint32_t pad; __u32 pad;
}; };
#define QXL_PARAM_NUM_SURFACES 1 /* rom->n_surfaces */ #define QXL_PARAM_NUM_SURFACES 1 /* rom->n_surfaces */
#define QXL_PARAM_MAX_RELOCS 2 #define QXL_PARAM_MAX_RELOCS 2
struct drm_qxl_getparam { struct drm_qxl_getparam {
uint64_t param; __u64 param;
uint64_t value; __u64 value;
}; };
/* these are one bit values */ /* these are one bit values */
struct drm_qxl_clientcap { struct drm_qxl_clientcap {
uint32_t index; __u32 index;
uint32_t pad; __u32 pad;
}; };
struct drm_qxl_alloc_surf { struct drm_qxl_alloc_surf {
uint32_t format; __u32 format;
uint32_t width; __u32 width;
uint32_t height; __u32 height;
int32_t stride; __s32 stride;
uint32_t handle; __u32 handle;
uint32_t pad; __u32 pad;
}; };
#define DRM_IOCTL_QXL_ALLOC \ #define DRM_IOCTL_QXL_ALLOC \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment