aboutsummaryrefslogtreecommitdiff
path: root/shared-core/drm.h
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-09-22 13:34:33 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-09-22 13:57:13 +0200
commitda63f4ba0f15c3ae614eba92c8219670c674727e (patch)
tree9b77d3602d8008d060e44e6ab90f6ed1f1f6cd06 /shared-core/drm.h
parent24e33627c5dfb92324a9faf1c7d366e7f33e622a (diff)
Add fence error member.
Modify the TTM backend bind arguments. Export a number of functions needed for driver-specific super-ioctls. Add a function to map buffer objects from the kernel, regardless of where they're currently placed. A number of error fixes.
Diffstat (limited to 'shared-core/drm.h')
-rw-r--r--shared-core/drm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 30c7a1a3..21386a57 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -639,6 +639,7 @@ struct drm_set_version {
#define DRM_FENCE_FLAG_SHAREABLE 0x00000002
#define DRM_FENCE_FLAG_WAIT_LAZY 0x00000004
#define DRM_FENCE_FLAG_WAIT_IGNORE_SIGNALS 0x00000008
+#define DRM_FENCE_FLAG_NO_USER 0x00000010
/* Reserved for driver use */
#define DRM_FENCE_MASK_DRIVER 0xFF000000
@@ -651,7 +652,7 @@ struct drm_fence_arg {
unsigned int type;
unsigned int flags;
unsigned int signaled;
- unsigned int pad64;
+ unsigned int error;
uint64_t expand_pad[3]; /*Future expansion */
};