diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-10-05 12:11:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-10-05 12:11:43 +1000 |
| commit | 19b7cc34443889fc73de2e10462e1c0f9fa38041 (patch) | |
| tree | 1cd73a2ef2aaed132cbc766e4ad4a8d2e3dde4e6 /shared-core/drm.h | |
| parent | d351601899e5814d809b8e86ab6f0d6e7676f585 (diff) | |
| parent | 495bbbaadc93c574eb98dd2ad64bdca4d91d4152 (diff) | |
Merge branch 'pre-superioctl-branch'
Diffstat (limited to 'shared-core/drm.h')
| -rw-r--r-- | shared-core/drm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index b4754ead..19292344 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,8 +652,10 @@ struct drm_fence_arg { unsigned int type; unsigned int flags; unsigned int signaled; + unsigned int error; unsigned int sequence; - uint64_t expand_pad[3]; /*Future expansion */ + unsigned int pad64; + uint64_t expand_pad[2]; /*Future expansion */ }; /* Buffer permissions, referring to how the GPU uses the buffers. |