diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-12-12 21:03:52 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-12 21:03:52 -0500 |
| commit | 0ca9fff744c8ae22401d1ef10a378588afd55abc (patch) | |
| tree | f78f01333f7f0c9ce684bfc2b793c2ae6d0977bb /include | |
| parent | 7fc61f845859fdca5a2c85a45eb39ce57cdd2276 (diff) | |
| parent | 11e6a09fba446ce799a9de51d2d99586024bbdaa (diff) | |
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.h | 1 |
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 @@ | |||
| 75 | #define DRM_VMW_PARAM_FIFO_CAPS 4 | 75 | #define DRM_VMW_PARAM_FIFO_CAPS 4 |
| 76 | #define DRM_VMW_PARAM_MAX_FB_SIZE 5 | 76 | #define DRM_VMW_PARAM_MAX_FB_SIZE 5 |
| 77 | #define DRM_VMW_PARAM_FIFO_HW_VERSION 6 | 77 | #define DRM_VMW_PARAM_FIFO_HW_VERSION 6 |
| 78 | #define DRM_VMW_PARAM_MAX_SURF_MEMORY 7 | ||
| 78 | 79 | ||
| 79 | /** | 80 | /** |
| 80 | * struct drm_vmw_getparam_arg | 81 | * struct drm_vmw_getparam_arg |