diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 10:10:47 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 10:10:47 -0800 |
| commit | b86b75ec57c381f32090a5bc61252f84f955c094 (patch) | |
| tree | 69afa8a88979bfa8fbdbcb106ddf8fe3ee5da99f /include/uapi/drm/vmwgfx_drm.h | |
| parent | 351d6204bfc814a1aee300296d2f54460ffff172 (diff) | |
| parent | 413541dd66d51f791a0b169d9b9014e4f56be13c (diff) | |
| download | blackbird-obmc-linux-b86b75ec57c381f32090a5bc61252f84f955c094.tar.gz blackbird-obmc-linux-b86b75ec57c381f32090a5bc61252f84f955c094.zip | |
Merge 3.13-rc5 into tty-next
We need the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/drm/vmwgfx_drm.h')
| -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 @@ #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 |
