summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-12-13 12:03:52 +1000
committerDave Airlie <airlied@redhat.com>2013-12-13 12:03:52 +1000
commit0ca9fff744c8ae22401d1ef10a378588afd55abc (patch)
treef78f01333f7f0c9ce684bfc2b793c2ae6d0977bb /include
parent7fc61f845859fdca5a2c85a45eb39ce57cdd2276 (diff)
parent11e6a09fba446ce799a9de51d2d99586024bbdaa (diff)
downloadlwn-0ca9fff744c8ae22401d1ef10a378588afd55abc.tar.gz
lwn-0ca9fff744c8ae22401d1ef10a378588afd55abc.zip
Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Part of a driver stack fix that fixes surface overcommiting on single execbuf calls. * 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux: drm/vmwgfx: Add max surface memory param
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 bcb0912afe7a..f854ca4a1372 100644
--- a/include/uapi/drm/vmwgfx_drm.h
+++ b/include/uapi/drm/vmwgfx_drm.h
@@ -75,6 +75,7 @@
#define DRM_VMW_PARAM_FIFO_CAPS 4
#define DRM_VMW_PARAM_MAX_FB_SIZE 5
#define DRM_VMW_PARAM_FIFO_HW_VERSION 6
+#define DRM_VMW_PARAM_MAX_SURF_MEMORY 7
/**
* struct drm_vmw_getparam_arg