aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie2017-10-10 19:41:25 -0500
committerDave Airlie2017-10-10 19:41:25 -0500
commitd27fd2d02300fdc107c9cc54d57989b8a29efd9f (patch)
treec0b502be18eb586f75f8ad7072d09358631bc8a3 /include
parent965133914b14f571b91109814c393b62f7bc588a (diff)
downloadexternal-libgbm-d27fd2d02300fdc107c9cc54d57989b8a29efd9f.tar.gz
external-libgbm-d27fd2d02300fdc107c9cc54d57989b8a29efd9f.tar.xz
external-libgbm-d27fd2d02300fdc107c9cc54d57989b8a29efd9f.zip
headers: sync syncobj ioctl defines.
This syncs the drm.h header with my drm-next branch as of bb7a9c8d712f37385a706a594d6edf6e6d2669d0 Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm.h22
1 files changed, 22 insertions, 0 deletions
diff --git a/include/drm/drm.h b/include/drm/drm.h
index bf3674ae..4737261a 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -694,6 +694,7 @@ struct drm_prime_handle {
694 694
695struct drm_syncobj_create { 695struct drm_syncobj_create {
696 __u32 handle; 696 __u32 handle;
697#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0)
697 __u32 flags; 698 __u32 flags;
698}; 699};
699 700
@@ -712,6 +713,24 @@ struct drm_syncobj_handle {
712 __u32 pad; 713 __u32 pad;
713}; 714};
714 715
716#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0)
717#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1)
718struct drm_syncobj_wait {
719 __u64 handles;
720 /* absolute timeout */
721 __s64 timeout_nsec;
722 __u32 count_handles;
723 __u32 flags;
724 __u32 first_signaled; /* only valid when not waiting all */
725 __u32 pad;
726};
727
728struct drm_syncobj_array {
729 __u64 handles;
730 __u32 count_handles;
731 __u32 pad;
732};
733
715#if defined(__cplusplus) 734#if defined(__cplusplus)
716} 735}
717#endif 736#endif
@@ -834,6 +853,9 @@ extern "C" {
834#define DRM_IOCTL_SYNCOBJ_DESTROY DRM_IOWR(0xC0, struct drm_syncobj_destroy) 853#define DRM_IOCTL_SYNCOBJ_DESTROY DRM_IOWR(0xC0, struct drm_syncobj_destroy)
835#define DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD DRM_IOWR(0xC1, struct drm_syncobj_handle) 854#define DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD DRM_IOWR(0xC1, struct drm_syncobj_handle)
836#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE DRM_IOWR(0xC2, struct drm_syncobj_handle) 855#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE DRM_IOWR(0xC2, struct drm_syncobj_handle)
856#define DRM_IOCTL_SYNCOBJ_WAIT DRM_IOWR(0xC3, struct drm_syncobj_wait)
857#define DRM_IOCTL_SYNCOBJ_RESET DRM_IOWR(0xC4, struct drm_syncobj_array)
858#define DRM_IOCTL_SYNCOBJ_SIGNAL DRM_IOWR(0xC5, struct drm_syncobj_array)
837 859
838/** 860/**
839 * Device specific ioctls should only be in their respective headers 861 * Device specific ioctls should only be in their respective headers