History

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

Fixes userspace compilation errors like: error: unknown type name ‘uint32_t’

Mikko Rapeli committed 11 years ago

Commit 21de2fd1 parent 5b8573f1 file · +132 −132Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/drm/vmwgfx_drm.h+132−132
@@ -111,9 +111,9 @@ enum drm_vmw_handle_type { · 110 unmodified lines
111 */111 */
112 112
113struct drm_vmw_getparam_arg {113struct drm_vmw_getparam_arg {
114 uint64_t value;114 __u64 value;
115 uint32_t param;115 __u32 param;
116 uint32_t pad64;116 __u32 pad64;
117};117};
118 118
119/*************************************************************************/119/*************************************************************************/
@@ -134,8 +134,8 @@ struct drm_vmw_getparam_arg { · 14 unmodified lines
134 */134 */
135 135
136struct drm_vmw_context_arg {136struct drm_vmw_context_arg {
137 int32_t cid;137 __s32 cid;
138 uint32_t pad64;138 __u32 pad64;
139};139};
140 140
141/*************************************************************************/141/*************************************************************************/
@@ -165,7 +165,7 @@ struct drm_vmw_context_arg { · 23 unmodified lines
165 * @mip_levels: Number of mip levels for each face.165 * @mip_levels: Number of mip levels for each face.
166 * An unused face should have 0 encoded.166 * An unused face should have 0 encoded.
167 * @size_addr: Address of a user-space array of sruct drm_vmw_size167 * @size_addr: Address of a user-space array of sruct drm_vmw_size
168 * cast to an uint64_t for 32-64 bit compatibility.168 * cast to an __u64 for 32-64 bit compatibility.
169 * The size of the array should equal the total number of mipmap levels.169 * The size of the array should equal the total number of mipmap levels.
170 * @shareable: Boolean whether other clients (as identified by file descriptors)170 * @shareable: Boolean whether other clients (as identified by file descriptors)
171 * may reference this surface.171 * may reference this surface.
@@ -177,12 +177,12 @@ struct drm_vmw_context_arg { · 5 unmodified lines
177 */177 */
178 178
179struct drm_vmw_surface_create_req {179struct drm_vmw_surface_create_req {
180 uint32_t flags;180 __u32 flags;
181 uint32_t format;181 __u32 format;
182 uint32_t mip_levels[DRM_VMW_MAX_SURFACE_FACES];182 __u32 mip_levels[DRM_VMW_MAX_SURFACE_FACES];
183 uint64_t size_addr;183 __u64 size_addr;
184 int32_t shareable;184 __s32 shareable;
185 int32_t scanout;185 __s32 scanout;
186};186};
187 187
188/**188/**
@@ -197,7 +197,7 @@ struct drm_vmw_surface_create_req { · 8 unmodified lines
197 */197 */
198 198
199struct drm_vmw_surface_arg {199struct drm_vmw_surface_arg {
200 int32_t sid;200 __s32 sid;
201 enum drm_vmw_handle_type handle_type;201 enum drm_vmw_handle_type handle_type;
202};202};
203 203
@@ -213,10 +213,10 @@ struct drm_vmw_surface_arg { · 9 unmodified lines
213 */213 */
214 214
215struct drm_vmw_size {215struct drm_vmw_size {
216 uint32_t width;216 __u32 width;
217 uint32_t height;217 __u32 height;
218 uint32_t depth;218 __u32 depth;
219 uint32_t pad64;219 __u32 pad64;
220};220};
221 221
222/**222/**
@@ -284,13 +284,13 @@ union drm_vmw_surface_reference_arg { · 61 unmodified lines
284/**284/**
285 * struct drm_vmw_execbuf_arg285 * struct drm_vmw_execbuf_arg
286 *286 *
287 * @commands: User-space address of a command buffer cast to an uint64_t.287 * @commands: User-space address of a command buffer cast to an __u64.
288 * @command-size: Size in bytes of the command buffer.288 * @command-size: Size in bytes of the command buffer.
289 * @throttle-us: Sleep until software is less than @throttle_us289 * @throttle-us: Sleep until software is less than @throttle_us
290 * microseconds ahead of hardware. The driver may round this value290 * microseconds ahead of hardware. The driver may round this value
291 * to the nearest kernel tick.291 * to the nearest kernel tick.
292 * @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an292 * @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an
293 * uint64_t.293 * __u64.
294 * @version: Allows expanding the execbuf ioctl parameters without breaking294 * @version: Allows expanding the execbuf ioctl parameters without breaking
295 * backwards compatibility, since user-space will always tell the kernel295 * backwards compatibility, since user-space will always tell the kernel
296 * which version it uses.296 * which version it uses.
@@ -302,14 +302,14 @@ union drm_vmw_surface_reference_arg { · 5 unmodified lines
302#define DRM_VMW_EXECBUF_VERSION 2302#define DRM_VMW_EXECBUF_VERSION 2
303 303
304struct drm_vmw_execbuf_arg {304struct drm_vmw_execbuf_arg {
305 uint64_t commands;305 __u64 commands;
306 uint32_t command_size;306 __u32 command_size;
307 uint32_t throttle_us;307 __u32 throttle_us;
308 uint64_t fence_rep;308 __u64 fence_rep;
309 uint32_t version;309 __u32 version;
310 uint32_t flags;310 __u32 flags;
311 uint32_t context_handle;311 __u32 context_handle;
312 uint32_t pad64;312 __u32 pad64;
313};313};
314 314
315/**315/**
@@ -338,12 +338,12 @@ struct drm_vmw_execbuf_arg { · 22 unmodified lines
338 */338 */
339 339
340struct drm_vmw_fence_rep {340struct drm_vmw_fence_rep {
341 uint32_t handle;341 __u32 handle;
342 uint32_t mask;342 __u32 mask;
343 uint32_t seqno;343 __u32 seqno;
344 uint32_t passed_seqno;344 __u32 passed_seqno;
345 uint32_t pad64;345 __u32 pad64;
346 int32_t error;346 __s32 error;
347};347};
348 348
349/*************************************************************************/349/*************************************************************************/
@@ -373,8 +373,8 @@ struct drm_vmw_fence_rep { · 23 unmodified lines
373 */373 */
374 374
375struct drm_vmw_alloc_dmabuf_req {375struct drm_vmw_alloc_dmabuf_req {
376 uint32_t size;376 __u32 size;
377 uint32_t pad64;377 __u32 pad64;
378};378};
379 379
380/**380/**
@@ -391,11 +391,11 @@ struct drm_vmw_alloc_dmabuf_req { · 10 unmodified lines
391 */391 */
392 392
393struct drm_vmw_dmabuf_rep {393struct drm_vmw_dmabuf_rep {
394 uint64_t map_handle;394 __u64 map_handle;
395 uint32_t handle;395 __u32 handle;
396 uint32_t cur_gmr_id;396 __u32 cur_gmr_id;
397 uint32_t cur_gmr_offset;397 __u32 cur_gmr_offset;
398 uint32_t pad64;398 __u32 pad64;
399};399};
400 400
401/**401/**
@@ -428,8 +428,8 @@ union drm_vmw_alloc_dmabuf_arg { · 26 unmodified lines
428 */428 */
429 429
430struct drm_vmw_unref_dmabuf_arg {430struct drm_vmw_unref_dmabuf_arg {
431 uint32_t handle;431 __u32 handle;
432 uint32_t pad64;432 __u32 pad64;
433};433};
434 434
435/*************************************************************************/435/*************************************************************************/
@@ -452,10 +452,10 @@ struct drm_vmw_unref_dmabuf_arg { · 16 unmodified lines
452 */452 */
453 453
454struct drm_vmw_rect {454struct drm_vmw_rect {
455 int32_t x;455 __s32 x;
456 int32_t y;456 __s32 y;
457 uint32_t w;457 __u32 w;
458 uint32_t h;458 __u32 h;
459};459};
460 460
461/**461/**
@@ -477,21 +477,21 @@ struct drm_vmw_rect { · 15 unmodified lines
477 */477 */
478 478
479struct drm_vmw_control_stream_arg {479struct drm_vmw_control_stream_arg {
480 uint32_t stream_id;480 __u32 stream_id;
481 uint32_t enabled;481 __u32 enabled;
482 482
483 uint32_t flags;483 __u32 flags;
484 uint32_t color_key;484 __u32 color_key;
485 485
486 uint32_t handle;486 __u32 handle;
487 uint32_t offset;487 __u32 offset;
488 int32_t format;488 __s32 format;
489 uint32_t size;489 __u32 size;
490 uint32_t width;490 __u32 width;
491 uint32_t height;491 __u32 height;
492 uint32_t pitch[3];492 __u32 pitch[3];
493 493
494 uint32_t pad64;494 __u32 pad64;
495 struct drm_vmw_rect src;495 struct drm_vmw_rect src;
496 struct drm_vmw_rect dst;496 struct drm_vmw_rect dst;
497};497};
@@ -519,12 +519,12 @@ struct drm_vmw_control_stream_arg { · 21 unmodified lines
519 */519 */
520 520
521struct drm_vmw_cursor_bypass_arg {521struct drm_vmw_cursor_bypass_arg {
522 uint32_t flags;522 __u32 flags;
523 uint32_t crtc_id;523 __u32 crtc_id;
524 int32_t xpos;524 __s32 xpos;
525 int32_t ypos;525 __s32 ypos;
526 int32_t xhot;526 __s32 xhot;
527 int32_t yhot;527 __s32 yhot;
528};528};
529 529
530/*************************************************************************/530/*************************************************************************/
@@ -542,8 +542,8 @@ struct drm_vmw_cursor_bypass_arg { · 11 unmodified lines
542 */542 */
543 543
544struct drm_vmw_stream_arg {544struct drm_vmw_stream_arg {
545 uint32_t stream_id;545 __u32 stream_id;
546 uint32_t pad64;546 __u32 pad64;
547};547};
548 548
549/*************************************************************************/549/*************************************************************************/
@@ -565,7 +565,7 @@ struct drm_vmw_stream_arg { · 15 unmodified lines
565/**565/**
566 * struct drm_vmw_get_3d_cap_arg566 * struct drm_vmw_get_3d_cap_arg
567 *567 *
568 * @buffer: Pointer to a buffer for capability data, cast to an uint64_t568 * @buffer: Pointer to a buffer for capability data, cast to an __u64
569 * @size: Max size to copy569 * @size: Max size to copy
570 *570 *
571 * Input argument to the DRM_VMW_GET_3D_CAP_IOCTL571 * Input argument to the DRM_VMW_GET_3D_CAP_IOCTL
@@ -573,9 +573,9 @@ struct drm_vmw_stream_arg { · 1 unmodified line
573 */573 */
574 574
575struct drm_vmw_get_3d_cap_arg {575struct drm_vmw_get_3d_cap_arg {
576 uint64_t buffer;576 __u64 buffer;
577 uint32_t max_size;577 __u32 max_size;
578 uint32_t pad64;578 __u32 pad64;
579};579};
580 580
581/*************************************************************************/581/*************************************************************************/
@@ -624,14 +624,14 @@ struct drm_vmw_get_3d_cap_arg { · 42 unmodified lines
624 */624 */
625 625
626struct drm_vmw_fence_wait_arg {626struct drm_vmw_fence_wait_arg {
627 uint32_t handle;627 __u32 handle;
628 int32_t cookie_valid;628 __s32 cookie_valid;
629 uint64_t kernel_cookie;629 __u64 kernel_cookie;
630 uint64_t timeout_us;630 __u64 timeout_us;
631 int32_t lazy;631 __s32 lazy;
632 int32_t flags;632 __s32 flags;
633 int32_t wait_options;633 __s32 wait_options;
634 int32_t pad64;634 __s32 pad64;
635};635};
636 636
637/*************************************************************************/637/*************************************************************************/
@@ -655,12 +655,12 @@ struct drm_vmw_fence_wait_arg { · 17 unmodified lines
655 */655 */
656 656
657struct drm_vmw_fence_signaled_arg {657struct drm_vmw_fence_signaled_arg {
658 uint32_t handle;658 __u32 handle;
659 uint32_t flags;659 __u32 flags;
660 int32_t signaled;660 __s32 signaled;
661 uint32_t passed_seqno;661 __u32 passed_seqno;
662 uint32_t signaled_flags;662 __u32 signaled_flags;
663 uint32_t pad64;663 __u32 pad64;
664};664};
665 665
666/*************************************************************************/666/*************************************************************************/
@@ -681,8 +681,8 @@ struct drm_vmw_fence_signaled_arg { · 14 unmodified lines
681 */681 */
682 682
683struct drm_vmw_fence_arg {683struct drm_vmw_fence_arg {
684 uint32_t handle;684 __u32 handle;
685 uint32_t pad64;685 __u32 pad64;
686};686};
687 687
688 688
@@ -703,9 +703,9 @@ struct drm_vmw_fence_arg { · 14 unmodified lines
703 703
704struct drm_vmw_event_fence {704struct drm_vmw_event_fence {
705 struct drm_event base;705 struct drm_event base;
706 uint64_t user_data;706 __u64 user_data;
707 uint32_t tv_sec;707 __u32 tv_sec;
708 uint32_t tv_usec;708 __u32 tv_usec;
709};709};
710 710
711/*711/*
@@ -717,17 +717,17 @@ struct drm_vmw_event_fence { · 5 unmodified lines
717/**717/**
718 * struct drm_vmw_fence_event_arg718 * struct drm_vmw_fence_event_arg
719 *719 *
720 * @fence_rep: Pointer to fence_rep structure cast to uint64_t or 0 if720 * @fence_rep: Pointer to fence_rep structure cast to __u64 or 0 if
721 * the fence is not supposed to be referenced by user-space.721 * the fence is not supposed to be referenced by user-space.
722 * @user_info: Info to be delivered with the event.722 * @user_info: Info to be delivered with the event.
723 * @handle: Attach the event to this fence only.723 * @handle: Attach the event to this fence only.
724 * @flags: A set of flags as defined above.724 * @flags: A set of flags as defined above.
725 */725 */
726struct drm_vmw_fence_event_arg {726struct drm_vmw_fence_event_arg {
727 uint64_t fence_rep;727 __u64 fence_rep;
728 uint64_t user_data;728 __u64 user_data;
729 uint32_t handle;729 __u32 handle;
730 uint32_t flags;730 __u32 flags;
731};731};
732 732
733 733
@@ -747,7 +747,7 @@ struct drm_vmw_fence_event_arg { · 13 unmodified lines
747 * @sid: Surface id to present from.747 * @sid: Surface id to present from.
748 * @dest_x: X placement coordinate for surface.748 * @dest_x: X placement coordinate for surface.
749 * @dest_y: Y placement coordinate for surface.749 * @dest_y: Y placement coordinate for surface.
750 * @clips_ptr: Pointer to an array of clip rects cast to an uint64_t.750 * @clips_ptr: Pointer to an array of clip rects cast to an __u64.
751 * @num_clips: Number of cliprects given relative to the framebuffer origin,751 * @num_clips: Number of cliprects given relative to the framebuffer origin,
752 * in the same coordinate space as the frame buffer.752 * in the same coordinate space as the frame buffer.
753 * @pad64: Unused 64-bit padding.753 * @pad64: Unused 64-bit padding.
@@ -756,13 +756,13 @@ struct drm_vmw_fence_event_arg { · 2 unmodified lines
756 */756 */
757 757
758struct drm_vmw_present_arg {758struct drm_vmw_present_arg {
759 uint32_t fb_id;759 __u32 fb_id;
760 uint32_t sid;760 __u32 sid;
761 int32_t dest_x;761 __s32 dest_x;
762 int32_t dest_y;762 __s32 dest_y;
763 uint64_t clips_ptr;763 __u64 clips_ptr;
764 uint32_t num_clips;764 __u32 num_clips;
765 uint32_t pad64;765 __u32 pad64;
766};766};
767 767
768 768
@@ -780,16 +780,16 @@ struct drm_vmw_present_arg { · 11 unmodified lines
780 * struct drm_vmw_present_arg780 * struct drm_vmw_present_arg
781 * @fb_id: fb_id to present / read back from.781 * @fb_id: fb_id to present / read back from.
782 * @num_clips: Number of cliprects.782 * @num_clips: Number of cliprects.
783 * @clips_ptr: Pointer to an array of clip rects cast to an uint64_t.783 * @clips_ptr: Pointer to an array of clip rects cast to an __u64.
784 * @fence_rep: Pointer to a struct drm_vmw_fence_rep, cast to an uint64_t.784 * @fence_rep: Pointer to a struct drm_vmw_fence_rep, cast to an __u64.
785 * If this member is NULL, then the ioctl should not return a fence.785 * If this member is NULL, then the ioctl should not return a fence.
786 */786 */
787 787
788struct drm_vmw_present_readback_arg {788struct drm_vmw_present_readback_arg {
789 uint32_t fb_id;789 __u32 fb_id;
790 uint32_t num_clips;790 __u32 num_clips;
791 uint64_t clips_ptr;791 __u64 clips_ptr;
792 uint64_t fence_rep;792 __u64 fence_rep;
793};793};
794 794
795/*************************************************************************/795/*************************************************************************/
@@ -805,14 +805,14 @@ struct drm_vmw_present_readback_arg { · 9 unmodified lines
805 * struct drm_vmw_update_layout_arg805 * struct drm_vmw_update_layout_arg
806 *806 *
807 * @num_outputs: number of active connectors807 * @num_outputs: number of active connectors
808 * @rects: pointer to array of drm_vmw_rect cast to an uint64_t808 * @rects: pointer to array of drm_vmw_rect cast to an __u64
809 *809 *
810 * Input argument to the DRM_VMW_UPDATE_LAYOUT Ioctl.810 * Input argument to the DRM_VMW_UPDATE_LAYOUT Ioctl.
811 */811 */
812struct drm_vmw_update_layout_arg {812struct drm_vmw_update_layout_arg {
813 uint32_t num_outputs;813 __u32 num_outputs;
814 uint32_t pad64;814 __u32 pad64;
815 uint64_t rects;815 __u64 rects;
816};816};
817 817
818 818
@@ -849,10 +849,10 @@ enum drm_vmw_shader_type { · 30 unmodified lines
849 */849 */
850struct drm_vmw_shader_create_arg {850struct drm_vmw_shader_create_arg {
851 enum drm_vmw_shader_type shader_type;851 enum drm_vmw_shader_type shader_type;
852 uint32_t size;852 __u32 size;
853 uint32_t buffer_handle;853 __u32 buffer_handle;
854 uint32_t shader_handle;854 __u32 shader_handle;
855 uint64_t offset;855 __u64 offset;
856};856};
857 857
858/*************************************************************************/858/*************************************************************************/
@@ -871,8 +871,8 @@ struct drm_vmw_shader_create_arg { · 12 unmodified lines
871 * Input argument to the DRM_VMW_UNREF_SHADER ioctl.871 * Input argument to the DRM_VMW_UNREF_SHADER ioctl.
872 */872 */
873struct drm_vmw_shader_arg {873struct drm_vmw_shader_arg {
874 uint32_t handle;874 __u32 handle;
875 uint32_t pad64;875 __u32 pad64;
876};876};
877 877
878/*************************************************************************/878/*************************************************************************/
@@ -918,14 +918,14 @@ enum drm_vmw_surface_flags { · 39 unmodified lines
918 * Part of output argument for the DRM_VMW_GB_SURFACE_REF Ioctl.918 * Part of output argument for the DRM_VMW_GB_SURFACE_REF Ioctl.
919 */919 */
920struct drm_vmw_gb_surface_create_req {920struct drm_vmw_gb_surface_create_req {
921 uint32_t svga3d_flags;921 __u32 svga3d_flags;
922 uint32_t format;922 __u32 format;
923 uint32_t mip_levels;923 __u32 mip_levels;
924 enum drm_vmw_surface_flags drm_surface_flags;924 enum drm_vmw_surface_flags drm_surface_flags;
925 uint32_t multisample_count;925 __u32 multisample_count;
926 uint32_t autogen_filter;926 __u32 autogen_filter;
927 uint32_t buffer_handle;927 __u32 buffer_handle;
928 uint32_t array_size;928 __u32 array_size;
929 struct drm_vmw_size base_size;929 struct drm_vmw_size base_size;
930};930};
931 931
@@ -944,11 +944,11 @@ struct drm_vmw_gb_surface_create_req { · 12 unmodified lines
944 * Output argument for the DRM_VMW_GB_SURFACE_CREATE ioctl.944 * Output argument for the DRM_VMW_GB_SURFACE_CREATE ioctl.
945 */945 */
946struct drm_vmw_gb_surface_create_rep {946struct drm_vmw_gb_surface_create_rep {
947 uint32_t handle;947 __u32 handle;
948 uint32_t backup_size;948 __u32 backup_size;
949 uint32_t buffer_handle;949 __u32 buffer_handle;
950 uint32_t buffer_size;950 __u32 buffer_size;
951 uint64_t buffer_map_handle;951 __u64 buffer_map_handle;
952};952};
953 953
954/**954/**
@@ -1061,8 +1061,8 @@ enum drm_vmw_synccpu_op { · 106 unmodified lines
1061struct drm_vmw_synccpu_arg {1061struct drm_vmw_synccpu_arg {
1062 enum drm_vmw_synccpu_op op;1062 enum drm_vmw_synccpu_op op;
1063 enum drm_vmw_synccpu_flags flags;1063 enum drm_vmw_synccpu_flags flags;
1064 uint32_t handle;1064 __u32 handle;
1065 uint32_t pad64;1065 __u32 pad64;
1066};1066};
1067 1067
1068/*************************************************************************/1068/*************************************************************************/

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t