summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-08-29 10:45:34 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-08-29 10:45:34 +0200
commit279e8d26c6cf7347aa9cb6d50d025a41dff9a5be (patch)
tree99a18283601f80f59f74bcff273bbe3b0fcd2dd2 /shared-core
parent205740647060bc3bdec2b4402a666eb1015932ff (diff)
64-bit IOCTL integer (Michel Dänzer & Brian Paul)
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/drm.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index d03eebcb..f8479dd0 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -134,6 +134,12 @@
#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
#if defined(__linux__)
+#if defined(__KERNEL__)
+typedef __u64 drm_u64_t;
+#else
+typedef unsigned long long drm_u64_t;
+#endif
+
typedef unsigned int drm_handle_t;
#else
typedef unsigned long drm_handle_t; /**< To mapped regions */
@@ -630,10 +636,7 @@ typedef struct drm_set_version {
int drm_dd_minor;
} drm_set_version_t;
-typedef struct drm_u64{
- unsigned lo;
- unsigned hi;
-}drm_u64_t;
+#ifdef __linux__
#define DRM_FENCE_FLAG_EMIT 0x00000001
#define DRM_FENCE_FLAG_SHAREABLE 0x00000002
@@ -739,7 +742,7 @@ typedef union drm_bo_arg{
drm_bo_arg_request_t req;
drm_bo_arg_reply_t rep;
} drm_bo_arg_t;
-
+#endif
/**
* \name Ioctls Definitions
@@ -806,8 +809,10 @@ typedef union drm_bo_arg{
#define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, drm_wait_vblank_t)
+#ifdef __linux__
#define DRM_IOCTL_FENCE DRM_IOWR(0x3b, drm_fence_arg_t)
#define DRM_IOCTL_TTM DRM_IOWR(0x3c, drm_ttm_arg_t)
+#endif
/*@}*/