diff options
author | Michel Dänzer | 2016-10-13 02:53:36 -0500 |
---|---|---|
committer | Michel Dänzer | 2016-10-13 02:53:36 -0500 |
commit | 9433b702fc164c3fe9e17d646eeaaa5de17a52de (patch) | |
tree | 250bd1aa47e1312d7ab155cf4d90a38d72cbecc8 /include/drm/drm.h | |
parent | a44c9c31b7b38b3eedf3d26648f9e68dcc377c4c (diff) | |
download | external-libgbm-9433b702fc164c3fe9e17d646eeaaa5de17a52de.tar.gz external-libgbm-9433b702fc164c3fe9e17d646eeaaa5de17a52de.tar.xz external-libgbm-9433b702fc164c3fe9e17d646eeaaa5de17a52de.zip |
headers: Sync drm{,_mode}.h with the kernel
Generated using make headers_install, based on linus master commit
b67be92feb486f800d80d72c67fd87b47b79b18e.
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Diffstat (limited to 'include/drm/drm.h')
-rw-r--r-- | include/drm/drm.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/drm/drm.h b/include/drm/drm.h index b4ebaa96..f6fd5c2c 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h | |||
@@ -59,6 +59,10 @@ typedef unsigned long drm_handle_t; | |||
59 | 59 | ||
60 | #endif | 60 | #endif |
61 | 61 | ||
62 | #if defined(__cplusplus) | ||
63 | extern "C" { | ||
64 | #endif | ||
65 | |||
62 | #define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ | 66 | #define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ |
63 | #define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ | 67 | #define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ |
64 | #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ | 68 | #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ |
@@ -636,6 +640,7 @@ struct drm_gem_open { | |||
636 | #define DRM_CAP_CURSOR_WIDTH 0x8 | 640 | #define DRM_CAP_CURSOR_WIDTH 0x8 |
637 | #define DRM_CAP_CURSOR_HEIGHT 0x9 | 641 | #define DRM_CAP_CURSOR_HEIGHT 0x9 |
638 | #define DRM_CAP_ADDFB2_MODIFIERS 0x10 | 642 | #define DRM_CAP_ADDFB2_MODIFIERS 0x10 |
643 | #define DRM_CAP_PAGE_FLIP_TARGET 0x11 | ||
639 | 644 | ||
640 | /** DRM_IOCTL_GET_CAP ioctl argument type */ | 645 | /** DRM_IOCTL_GET_CAP ioctl argument type */ |
641 | struct drm_get_cap { | 646 | struct drm_get_cap { |
@@ -685,8 +690,16 @@ struct drm_prime_handle { | |||
685 | __s32 fd; | 690 | __s32 fd; |
686 | }; | 691 | }; |
687 | 692 | ||
693 | #if defined(__cplusplus) | ||
694 | } | ||
695 | #endif | ||
696 | |||
688 | #include "drm_mode.h" | 697 | #include "drm_mode.h" |
689 | 698 | ||
699 | #if defined(__cplusplus) | ||
700 | extern "C" { | ||
701 | #endif | ||
702 | |||
690 | #define DRM_IOCTL_BASE 'd' | 703 | #define DRM_IOCTL_BASE 'd' |
691 | #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) | 704 | #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) |
692 | #define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type) | 705 | #define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type) |
@@ -878,4 +891,8 @@ typedef struct drm_agp_info drm_agp_info_t; | |||
878 | typedef struct drm_scatter_gather drm_scatter_gather_t; | 891 | typedef struct drm_scatter_gather drm_scatter_gather_t; |
879 | typedef struct drm_set_version drm_set_version_t; | 892 | typedef struct drm_set_version drm_set_version_t; |
880 | 893 | ||
894 | #if defined(__cplusplus) | ||
895 | } | ||
896 | #endif | ||
897 | |||
881 | #endif | 898 | #endif |