diff options
Diffstat (limited to 'include/drm/drm.h')
-rw-r--r-- | include/drm/drm.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/drm/drm.h b/include/drm/drm.h index 8e77357334ad..7cb50bdde46d 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h | |||
@@ -36,8 +36,7 @@ | |||
36 | #ifndef _DRM_H_ | 36 | #ifndef _DRM_H_ |
37 | #define _DRM_H_ | 37 | #define _DRM_H_ |
38 | 38 | ||
39 | #if defined(__KERNEL__) | 39 | #include <linux/types.h> |
40 | #endif | ||
41 | #include <asm/ioctl.h> /* For _IO* macros */ | 40 | #include <asm/ioctl.h> /* For _IO* macros */ |
42 | #define DRM_IOCTL_NR(n) _IOC_NR(n) | 41 | #define DRM_IOCTL_NR(n) _IOC_NR(n) |
43 | #define DRM_IOC_VOID _IOC_NONE | 42 | #define DRM_IOC_VOID _IOC_NONE |
@@ -497,8 +496,8 @@ union drm_wait_vblank { | |||
497 | * \sa drmModesetCtl(). | 496 | * \sa drmModesetCtl(). |
498 | */ | 497 | */ |
499 | struct drm_modeset_ctl { | 498 | struct drm_modeset_ctl { |
500 | uint32_t crtc; | 499 | __u32 crtc; |
501 | uint32_t cmd; | 500 | __u32 cmd; |
502 | }; | 501 | }; |
503 | 502 | ||
504 | /** | 503 | /** |
@@ -574,29 +573,29 @@ struct drm_set_version { | |||
574 | /** DRM_IOCTL_GEM_CLOSE ioctl argument type */ | 573 | /** DRM_IOCTL_GEM_CLOSE ioctl argument type */ |
575 | struct drm_gem_close { | 574 | struct drm_gem_close { |
576 | /** Handle of the object to be closed. */ | 575 | /** Handle of the object to be closed. */ |
577 | uint32_t handle; | 576 | __u32 handle; |
578 | uint32_t pad; | 577 | __u32 pad; |
579 | }; | 578 | }; |
580 | 579 | ||
581 | /** DRM_IOCTL_GEM_FLINK ioctl argument type */ | 580 | /** DRM_IOCTL_GEM_FLINK ioctl argument type */ |
582 | struct drm_gem_flink { | 581 | struct drm_gem_flink { |
583 | /** Handle for the object being named */ | 582 | /** Handle for the object being named */ |
584 | uint32_t handle; | 583 | __u32 handle; |
585 | 584 | ||
586 | /** Returned global name */ | 585 | /** Returned global name */ |
587 | uint32_t name; | 586 | __u32 name; |
588 | }; | 587 | }; |
589 | 588 | ||
590 | /** DRM_IOCTL_GEM_OPEN ioctl argument type */ | 589 | /** DRM_IOCTL_GEM_OPEN ioctl argument type */ |
591 | struct drm_gem_open { | 590 | struct drm_gem_open { |
592 | /** Name of object being opened */ | 591 | /** Name of object being opened */ |
593 | uint32_t name; | 592 | __u32 name; |
594 | 593 | ||
595 | /** Returned handle for the object */ | 594 | /** Returned handle for the object */ |
596 | uint32_t handle; | 595 | __u32 handle; |
597 | 596 | ||
598 | /** Returned size of the object */ | 597 | /** Returned size of the object */ |
599 | uint64_t size; | 598 | __u64 size; |
600 | }; | 599 | }; |
601 | 600 | ||
602 | #include "drm_mode.h" | 601 | #include "drm_mode.h" |