aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie2017-06-28 14:27:39 -0500
committerDave Airlie2017-06-28 14:31:23 -0500
commit3832374dafb8d0b1b69d8856be28352514afab5d (patch)
tree1754bbf93864724522c19990363b6200c64a74af /include
parent92b5b308ca2fec356dd29bb2f27d88a5aff61798 (diff)
downloadexternal-libgbm-3832374dafb8d0b1b69d8856be28352514afab5d.tar.gz
external-libgbm-3832374dafb8d0b1b69d8856be28352514afab5d.tar.xz
external-libgbm-3832374dafb8d0b1b69d8856be28352514afab5d.zip
drm: update drm.h to latest in drm-next.
This syncs the drm.h header with my drm-next branch as of 6d61e70ccc21606ffb8a0a03bd3aba24f659502b. It brings over the semaphore API changes. Generated using make headers_install. Generated from git://people.freedesktop.org/~airlied/linux drm-next commit 6d61e70ccc2. [airlied: I split patch in two, split reviewed by across both] Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm.h26
1 files changed, 26 insertions, 0 deletions
diff --git a/include/drm/drm.h b/include/drm/drm.h
index 1e7a4bc7..bf3674ae 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -642,6 +642,7 @@ struct drm_gem_open {
642#define DRM_CAP_ADDFB2_MODIFIERS 0x10 642#define DRM_CAP_ADDFB2_MODIFIERS 0x10
643#define DRM_CAP_PAGE_FLIP_TARGET 0x11 643#define DRM_CAP_PAGE_FLIP_TARGET 0x11
644#define DRM_CAP_CRTC_IN_VBLANK_EVENT 0x12 644#define DRM_CAP_CRTC_IN_VBLANK_EVENT 0x12
645#define DRM_CAP_SYNCOBJ 0x13
645 646
646/** DRM_IOCTL_GET_CAP ioctl argument type */ 647/** DRM_IOCTL_GET_CAP ioctl argument type */
647struct drm_get_cap { 648struct drm_get_cap {
@@ -691,6 +692,26 @@ struct drm_prime_handle {
691 __s32 fd; 692 __s32 fd;
692}; 693};
693 694
695struct drm_syncobj_create {
696 __u32 handle;
697 __u32 flags;
698};
699
700struct drm_syncobj_destroy {
701 __u32 handle;
702 __u32 pad;
703};
704
705#define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE (1 << 0)
706#define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE (1 << 0)
707struct drm_syncobj_handle {
708 __u32 handle;
709 __u32 flags;
710
711 __s32 fd;
712 __u32 pad;
713};
714
694#if defined(__cplusplus) 715#if defined(__cplusplus)
695} 716}
696#endif 717#endif
@@ -809,6 +830,11 @@ extern "C" {
809#define DRM_IOCTL_MODE_CREATEPROPBLOB DRM_IOWR(0xBD, struct drm_mode_create_blob) 830#define DRM_IOCTL_MODE_CREATEPROPBLOB DRM_IOWR(0xBD, struct drm_mode_create_blob)
810#define DRM_IOCTL_MODE_DESTROYPROPBLOB DRM_IOWR(0xBE, struct drm_mode_destroy_blob) 831#define DRM_IOCTL_MODE_DESTROYPROPBLOB DRM_IOWR(0xBE, struct drm_mode_destroy_blob)
811 832
833#define DRM_IOCTL_SYNCOBJ_CREATE DRM_IOWR(0xBF, struct drm_syncobj_create)
834#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)
836#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE DRM_IOWR(0xC2, struct drm_syncobj_handle)
837
812/** 838/**
813 * Device specific ioctls should only be in their respective headers 839 * Device specific ioctls should only be in their respective headers
814 * The device specific ioctl range is from 0x40 to 0x9f. 840 * The device specific ioctl range is from 0x40 to 0x9f.