aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt2017-11-08 13:22:55 -0600
committerEric Anholt2017-11-10 14:10:17 -0600
commitf696698e0249a8b65ef7d1a0c484633fc3f286ef (patch)
tree1ed1425f17ac827b4afc744520f94fde6928822f /include/drm/qxl_drm.h
parent59808bcacd48f4168c3c1093b4616c2ee039b5a1 (diff)
downloadexternal-libgbm-f696698e0249a8b65ef7d1a0c484633fc3f286ef.tar.gz
external-libgbm-f696698e0249a8b65ef7d1a0c484633fc3f286ef.tar.xz
external-libgbm-f696698e0249a8b65ef7d1a0c484633fc3f286ef.zip
headers: Sync up kernel changes to use kernel types instead of stdint.h.
This pulls in pieces of drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'include/drm/qxl_drm.h')
-rw-r--r--include/drm/qxl_drm.h72
1 files changed, 36 insertions, 36 deletions
diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
index a520123b..38a0dbdf 100644
--- a/include/drm/qxl_drm.h
+++ b/include/drm/qxl_drm.h
@@ -52,14 +52,14 @@ extern "C" {
52#define DRM_QXL_ALLOC_SURF 0x06 52#define DRM_QXL_ALLOC_SURF 0x06
53 53
54struct drm_qxl_alloc { 54struct drm_qxl_alloc {
55 uint32_t size; 55 __u32 size;
56 uint32_t handle; /* 0 is an invalid handle */ 56 __u32 handle; /* 0 is an invalid handle */
57}; 57};
58 58
59struct drm_qxl_map { 59struct drm_qxl_map {
60 uint64_t offset; /* use for mmap system call */ 60 __u64 offset; /* use for mmap system call */
61 uint32_t handle; 61 __u32 handle;
62 uint32_t pad; 62 __u32 pad;
63}; 63};
64 64
65/* 65/*
@@ -72,59 +72,59 @@ struct drm_qxl_map {
72#define QXL_RELOC_TYPE_SURF 2 72#define QXL_RELOC_TYPE_SURF 2
73 73
74struct drm_qxl_reloc { 74struct drm_qxl_reloc {
75 uint64_t src_offset; /* offset into src_handle or src buffer */ 75 __u64 src_offset; /* offset into src_handle or src buffer */
76 uint64_t dst_offset; /* offset in dest handle */ 76 __u64 dst_offset; /* offset in dest handle */
77 uint32_t src_handle; /* dest handle to compute address from */ 77 __u32 src_handle; /* dest handle to compute address from */
78 uint32_t dst_handle; /* 0 if to command buffer */ 78 __u32 dst_handle; /* 0 if to command buffer */
79 uint32_t reloc_type; 79 __u32 reloc_type;
80 uint32_t pad; 80 __u32 pad;
81}; 81};
82 82
83struct drm_qxl_command { 83struct drm_qxl_command {
84 uint64_t command; /* void* */ 84 __u64 command; /* void* */
85 uint64_t relocs; /* struct drm_qxl_reloc* */ 85 __u64 relocs; /* struct drm_qxl_reloc* */
86 uint32_t type; 86 __u32 type;
87 uint32_t command_size; 87 __u32 command_size;
88 uint32_t relocs_num; 88 __u32 relocs_num;
89 uint32_t pad; 89 __u32 pad;
90}; 90};
91 91
92/* XXX: call it drm_qxl_commands? */ 92/* XXX: call it drm_qxl_commands? */
93struct drm_qxl_execbuffer { 93struct drm_qxl_execbuffer {
94 uint32_t flags; /* for future use */ 94 __u32 flags; /* for future use */
95 uint32_t commands_num; 95 __u32 commands_num;
96 uint64_t commands; /* struct drm_qxl_command* */ 96 __u64 commands; /* struct drm_qxl_command* */
97}; 97};
98 98
99struct drm_qxl_update_area { 99struct drm_qxl_update_area {
100 uint32_t handle; 100 __u32 handle;
101 uint32_t top; 101 __u32 top;
102 uint32_t left; 102 __u32 left;
103 uint32_t bottom; 103 __u32 bottom;
104 uint32_t right; 104 __u32 right;
105 uint32_t pad; 105 __u32 pad;
106}; 106};
107 107
108#define QXL_PARAM_NUM_SURFACES 1 /* rom->n_surfaces */ 108#define QXL_PARAM_NUM_SURFACES 1 /* rom->n_surfaces */
109#define QXL_PARAM_MAX_RELOCS 2 109#define QXL_PARAM_MAX_RELOCS 2
110struct drm_qxl_getparam { 110struct drm_qxl_getparam {
111 uint64_t param; 111 __u64 param;
112 uint64_t value; 112 __u64 value;
113}; 113};
114 114
115/* these are one bit values */ 115/* these are one bit values */
116struct drm_qxl_clientcap { 116struct drm_qxl_clientcap {
117 uint32_t index; 117 __u32 index;
118 uint32_t pad; 118 __u32 pad;
119}; 119};
120 120
121struct drm_qxl_alloc_surf { 121struct drm_qxl_alloc_surf {
122 uint32_t format; 122 __u32 format;
123 uint32_t width; 123 __u32 width;
124 uint32_t height; 124 __u32 height;
125 int32_t stride; 125 __s32 stride;
126 uint32_t handle; 126 __u32 handle;
127 uint32_t pad; 127 __u32 pad;
128}; 128};
129 129
130#define DRM_IOCTL_QXL_ALLOC \ 130#define DRM_IOCTL_QXL_ALLOC \