aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorMikko Rapeli <mikko.rapeli@iki.fi>2015-03-10 22:12:23 -0400
committerGabriel Laskar <gabriel@lse.epita.fr>2015-12-10 06:33:23 -0500
commit8e51012c4f2c6b4f2a318c71e1b43f552e6d2a2c (patch)
treed10c84a9699163e80708475b3353516fe88a43cc /include/uapi
parent21de2fda3cb31ed3ef1807310ac982a1b8fe7089 (diff)
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: Mikko Rapeli <mikko.rapeli@iki.fi>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/drm/qxl_drm.h74
1 files changed, 37 insertions, 37 deletions
diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h
index ebebd36c4117..dface362d729 100644
--- a/include/uapi/drm/qxl_drm.h
+++ b/include/uapi/drm/qxl_drm.h
@@ -30,7 +30,7 @@
30/* Please note that modifications to all structs defined here are 30/* Please note that modifications to all structs defined here are
31 * subject to backwards-compatibility constraints. 31 * subject to backwards-compatibility constraints.
32 * 32 *
33 * Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel 33 * Do not use pointers, use __u64 instead for 32 bit / 64 bit user/kernel
34 * compatibility Keep fields aligned to their size 34 * compatibility Keep fields aligned to their size
35 */ 35 */
36 36
@@ -48,14 +48,14 @@
48#define DRM_QXL_ALLOC_SURF 0x06 48#define DRM_QXL_ALLOC_SURF 0x06
49 49
50struct drm_qxl_alloc { 50struct drm_qxl_alloc {
51 uint32_t size; 51 __u32 size;
52 uint32_t handle; /* 0 is an invalid handle */ 52 __u32 handle; /* 0 is an invalid handle */
53}; 53};
54 54
55struct drm_qxl_map { 55struct drm_qxl_map {
56 uint64_t offset; /* use for mmap system call */ 56 __u64 offset; /* use for mmap system call */
57 uint32_t handle; 57 __u32 handle;
58 uint32_t pad; 58 __u32 pad;
59}; 59};
60 60
61/* 61/*
@@ -68,59 +68,59 @@ struct drm_qxl_map {
68#define QXL_RELOC_TYPE_SURF 2 68#define QXL_RELOC_TYPE_SURF 2
69 69
70struct drm_qxl_reloc { 70struct drm_qxl_reloc {
71 uint64_t src_offset; /* offset into src_handle or src buffer */ 71 __u64 src_offset; /* offset into src_handle or src buffer */
72 uint64_t dst_offset; /* offset in dest handle */ 72 __u64 dst_offset; /* offset in dest handle */
73 uint32_t src_handle; /* dest handle to compute address from */ 73 __u32 src_handle; /* dest handle to compute address from */
74 uint32_t dst_handle; /* 0 if to command buffer */ 74 __u32 dst_handle; /* 0 if to command buffer */
75 uint32_t reloc_type; 75 __u32 reloc_type;
76 uint32_t pad; 76 __u32 pad;
77}; 77};
78 78
79struct drm_qxl_command { 79struct drm_qxl_command {
80 uint64_t __user command; /* void* */ 80 __u64 __user command; /* void* */
81 uint64_t __user relocs; /* struct drm_qxl_reloc* */ 81 __u64 __user relocs; /* struct drm_qxl_reloc* */
82 uint32_t type; 82 __u32 type;
83 uint32_t command_size; 83 __u32 command_size;
84 uint32_t relocs_num; 84 __u32 relocs_num;
85 uint32_t pad; 85 __u32 pad;
86}; 86};
87 87
88/* XXX: call it drm_qxl_commands? */ 88/* XXX: call it drm_qxl_commands? */
89struct drm_qxl_execbuffer { 89struct drm_qxl_execbuffer {
90 uint32_t flags; /* for future use */ 90 __u32 flags; /* for future use */
91 uint32_t commands_num; 91 __u32 commands_num;
92 uint64_t __user commands; /* struct drm_qxl_command* */ 92 __u64 __user commands; /* struct drm_qxl_command* */
93}; 93};
94 94
95struct drm_qxl_update_area { 95struct drm_qxl_update_area {
96 uint32_t handle; 96 __u32 handle;
97 uint32_t top; 97 __u32 top;
98 uint32_t left; 98 __u32 left;
99 uint32_t bottom; 99 __u32 bottom;
100 uint32_t right; 100 __u32 right;
101 uint32_t pad; 101 __u32 pad;
102}; 102};
103 103
104#define QXL_PARAM_NUM_SURFACES 1 /* rom->n_surfaces */ 104#define QXL_PARAM_NUM_SURFACES 1 /* rom->n_surfaces */
105#define QXL_PARAM_MAX_RELOCS 2 105#define QXL_PARAM_MAX_RELOCS 2
106struct drm_qxl_getparam { 106struct drm_qxl_getparam {
107 uint64_t param; 107 __u64 param;
108 uint64_t value; 108 __u64 value;
109}; 109};
110 110
111/* these are one bit values */ 111/* these are one bit values */
112struct drm_qxl_clientcap { 112struct drm_qxl_clientcap {
113 uint32_t index; 113 __u32 index;
114 uint32_t pad; 114 __u32 pad;
115}; 115};
116 116
117struct drm_qxl_alloc_surf { 117struct drm_qxl_alloc_surf {
118 uint32_t format; 118 __u32 format;
119 uint32_t width; 119 __u32 width;
120 uint32_t height; 120 __u32 height;
121 int32_t stride; 121 __s32 stride;
122 uint32_t handle; 122 __u32 handle;
123 uint32_t pad; 123 __u32 pad;
124}; 124};
125 125
126#define DRM_IOCTL_QXL_ALLOC \ 126#define DRM_IOCTL_QXL_ALLOC \