summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-02-19 08:21:02 +1000
committerDave Airlie <airlied@redhat.com>2014-02-19 08:21:02 +1000
commit9830e44f560de2f9f9453bb7f0eb2979b36ed139 (patch)
tree7e6f24b1e3deec0742119b1d90696c0fa377a58c /include
parent560591f13e2f000977d887b31689f6b4d090ac4e (diff)
parent36e952c1ed8ca44bca245c465c8293e175dd9222 (diff)
downloadlinux-9830e44f560de2f9f9453bb7f0eb2979b36ed139.tar.gz
linux-9830e44f560de2f9f9453bb7f0eb2979b36ed139.tar.bz2
linux-9830e44f560de2f9f9453bb7f0eb2979b36ed139.zip
Merge tag 'vmwgfx-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Pull request of 2014-02-18. Nothing special. The biggest change is adding a couple of command defines and packing the command data correctly. * tag 'vmwgfx-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux: drm/vmwgfx: Fix command defines and checks drm/vmwgfx: Fix possible integer overflow drm/vmwgfx: Remove stray const drm/vmwgfx: unlock on error path in vmw_execbuf_process() drm/vmwgfx: Get maximum mob size from register SVGA_REG_MOB_MAX_SIZE drm/vmwgfx: Fix a couple of sparse warnings and errors
Diffstat (limited to 'include')
-rw-r--r--include/uapi/drm/vmwgfx_drm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h
index 9971c560ed9a..87792a5fee3b 100644
--- a/include/uapi/drm/vmwgfx_drm.h
+++ b/include/uapi/drm/vmwgfx_drm.h
@@ -87,6 +87,7 @@
#define DRM_VMW_PARAM_MAX_SURF_MEMORY 7
#define DRM_VMW_PARAM_3D_CAPS_SIZE 8
#define DRM_VMW_PARAM_MAX_MOB_MEMORY 9
+#define DRM_VMW_PARAM_MAX_MOB_SIZE 10
/**
* struct drm_vmw_getparam_arg