diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-02-19 08:21:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-02-19 08:21:02 +1000 |
| commit | 9830e44f560de2f9f9453bb7f0eb2979b36ed139 (patch) | |
| tree | 7e6f24b1e3deec0742119b1d90696c0fa377a58c /drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |
| parent | 560591f13e2f000977d887b31689f6b4d090ac4e (diff) | |
| parent | 36e952c1ed8ca44bca245c465c8293e175dd9222 (diff) | |
| download | blackbird-op-linux-9830e44f560de2f9f9453bb7f0eb2979b36ed139.tar.gz blackbird-op-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 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.h')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index ecaa302a6154..9e4be1725985 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -386,6 +386,7 @@ struct vmw_private { uint32_t max_gmr_ids; uint32_t max_gmr_pages; uint32_t max_mob_pages; + uint32_t max_mob_size; uint32_t memory_size; bool has_gmr; bool has_mob; |
