summaryrefslogtreecommitdiffstats
path: root/include/drm-uapi/drm.h
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2017-08-04 12:52:46 -0700
committerJason Ekstrand <[email protected]>2017-08-28 19:33:35 -0700
commit3cd26d981b007c2667156c2a5049de96f1bf9cf1 (patch)
treea6ecf07a6ac445742f69c43d519595adc2f2296d /include/drm-uapi/drm.h
parentae8365a9eb017161c294f2a9171d0cbfd7249e20 (diff)
drm-uapi: Update headers from drm-next
Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'include/drm-uapi/drm.h')
-rw-r--r--include/drm-uapi/drm.h22
1 files changed, 22 insertions, 0 deletions
diff --git a/include/drm-uapi/drm.h b/include/drm-uapi/drm.h
index bf3674ae8c2..4737261ae3f 100644
--- a/include/drm-uapi/drm.h
+++ b/include/drm-uapi/drm.h
@@ -694,6 +694,7 @@ struct drm_prime_handle {
struct drm_syncobj_create {
__u32 handle;
+#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0)
__u32 flags;
};
@@ -712,6 +713,24 @@ struct drm_syncobj_handle {
__u32 pad;
};
+#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0)
+#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1)
+struct drm_syncobj_wait {
+ __u64 handles;
+ /* absolute timeout */
+ __s64 timeout_nsec;
+ __u32 count_handles;
+ __u32 flags;
+ __u32 first_signaled; /* only valid when not waiting all */
+ __u32 pad;
+};
+
+struct drm_syncobj_array {
+ __u64 handles;
+ __u32 count_handles;
+ __u32 pad;
+};
+
#if defined(__cplusplus)
}
#endif
@@ -834,6 +853,9 @@ extern "C" {
#define DRM_IOCTL_SYNCOBJ_DESTROY DRM_IOWR(0xC0, struct drm_syncobj_destroy)
#define DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD DRM_IOWR(0xC1, struct drm_syncobj_handle)
#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE DRM_IOWR(0xC2, struct drm_syncobj_handle)
+#define DRM_IOCTL_SYNCOBJ_WAIT DRM_IOWR(0xC3, struct drm_syncobj_wait)
+#define DRM_IOCTL_SYNCOBJ_RESET DRM_IOWR(0xC4, struct drm_syncobj_array)
+#define DRM_IOCTL_SYNCOBJ_SIGNAL DRM_IOWR(0xC5, struct drm_syncobj_array)
/**
* Device specific ioctls should only be in their respective headers