diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2010-02-09 16:29:47 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-02-10 21:03:26 -0500 |
commit | a87897edbae2d60db7bcb6bb0a75e82013d68305 (patch) | |
tree | b0d1891b5bf73cd9dbad8ec22ab87813ad029522 /include/drm | |
parent | 3bef35721018d2bac08d0d03979606b65347211e (diff) |
drm/vmwgfx: Drop scanout flag compat and add execbuf ioctl parameter members. Bumps major.
Even if this bumps the version to 1 it does not mean the driver is
out of staging. From what we know this is the last backwards
incompatible change to the driver.
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/vmwgfx_drm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/drm/vmwgfx_drm.h b/include/drm/vmwgfx_drm.h index dfaf3c2d2c8e..c7645f480d12 100644 --- a/include/drm/vmwgfx_drm.h +++ b/include/drm/vmwgfx_drm.h | |||
@@ -303,15 +303,23 @@ union drm_vmw_surface_reference_arg { | |||
303 | * to the nearest kernel tick. | 303 | * to the nearest kernel tick. |
304 | * @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an | 304 | * @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an |
305 | * uint64_t. | 305 | * uint64_t. |
306 | * @version: Allows expanding the execbuf ioctl parameters without breaking | ||
307 | * backwards compatibility, since user-space will always tell the kernel | ||
308 | * which version it uses. | ||
309 | * @flags: Execbuf flags. None currently. | ||
306 | * | 310 | * |
307 | * Argument to the DRM_VMW_EXECBUF Ioctl. | 311 | * Argument to the DRM_VMW_EXECBUF Ioctl. |
308 | */ | 312 | */ |
309 | 313 | ||
314 | #define DRM_VMW_EXECBUF_VERSION 0 | ||
315 | |||
310 | struct drm_vmw_execbuf_arg { | 316 | struct drm_vmw_execbuf_arg { |
311 | uint64_t commands; | 317 | uint64_t commands; |
312 | uint32_t command_size; | 318 | uint32_t command_size; |
313 | uint32_t throttle_us; | 319 | uint32_t throttle_us; |
314 | uint64_t fence_rep; | 320 | uint64_t fence_rep; |
321 | uint32_t version; | ||
322 | uint32_t flags; | ||
315 | }; | 323 | }; |
316 | 324 | ||
317 | /** | 325 | /** |