summaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2010-02-09 21:29:47 +0000
committerDave Airlie <airlied@redhat.com>2010-02-11 12:03:26 +1000
commita87897edbae2d60db7bcb6bb0a75e82013d68305 (patch)
treeb0d1891b5bf73cd9dbad8ec22ab87813ad029522 /include/drm
parent3bef35721018d2bac08d0d03979606b65347211e (diff)
downloadkernel-mfld-blackbay-a87897edbae2d60db7bcb6bb0a75e82013d68305.tar.gz
kernel-mfld-blackbay-a87897edbae2d60db7bcb6bb0a75e82013d68305.tar.bz2
kernel-mfld-blackbay-a87897edbae2d60db7bcb6bb0a75e82013d68305.zip
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.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/drm/vmwgfx_drm.h b/include/drm/vmwgfx_drm.h
index dfaf3c2d2c8..c7645f480d1 100644
--- a/include/drm/vmwgfx_drm.h
+++ b/include/drm/vmwgfx_drm.h
@@ -303,15 +303,23 @@ union drm_vmw_surface_reference_arg {
* to the nearest kernel tick.
* @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an
* uint64_t.
+ * @version: Allows expanding the execbuf ioctl parameters without breaking
+ * backwards compatibility, since user-space will always tell the kernel
+ * which version it uses.
+ * @flags: Execbuf flags. None currently.
*
* Argument to the DRM_VMW_EXECBUF Ioctl.
*/
+#define DRM_VMW_EXECBUF_VERSION 0
+
struct drm_vmw_execbuf_arg {
uint64_t commands;
uint32_t command_size;
uint32_t throttle_us;
uint64_t fence_rep;
+ uint32_t version;
+ uint32_t flags;
};
/**