summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-09-25 18:03:31 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-09-25 18:03:31 +0200
commitc4b3a0f602abd02038f7e5dd45fcfb2df4b5fcfa (patch)
tree803662fb4d1eadb850d9ed2a622fe55d1ec97574 /shared-core
parent0774090d5b7d3eba734086b437021039bc19c365 (diff)
parent03c47f1420bf17a1e0f2b86be500656ae5a4c95b (diff)
Merge branch 'master' into pre-superioctl-branch
Conflicts: linux-core/drm_bo.c linux-core/drm_fence.c linux-core/drm_objects.h shared-core/drm.h
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/drm.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 21386a57..19292344 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -648,12 +648,14 @@ struct drm_set_version {
struct drm_fence_arg {
unsigned int handle;
- unsigned int class;
+ unsigned int fence_class;
unsigned int type;
unsigned int flags;
unsigned int signaled;
unsigned int error;
- uint64_t expand_pad[3]; /*Future expansion */
+ unsigned int sequence;
+ unsigned int pad64;
+ uint64_t expand_pad[2]; /*Future expansion */
};
/* Buffer permissions, referring to how the GPU uses the buffers.