diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-17 12:00:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-17 12:00:53 +1000 |
| commit | bc91d1810f70ed0b31df1c5ac879c43e35b9e330 (patch) | |
| tree | ef61b84e47e0dbd6a50362e7a5a8a97624c1880d /drivers/gpu | |
| parent | 3d3aa969cbb4f0a5586798de7885309c6550af18 (diff) | |
| parent | 91ba9f28a3de97761c2b5fd5df5d88421268e507 (diff) | |
| download | blackbird-op-linux-bc91d1810f70ed0b31df1c5ac879c43e35b9e330.tar.gz blackbird-op-linux-bc91d1810f70ed0b31df1c5ac879c43e35b9e330.zip | |
Merge branch 'vmwgfx-fixes-4.17' of git://people.freedesktop.org/~thomash/linux into drm-fixes
A single fix for a recent regression.
* 'vmwgfx-fixes-4.17' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Set dmabuf_size when vmw_dmabuf_init is successful
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c index 648f8127f65a..3d667e903beb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c @@ -482,6 +482,8 @@ vmw_sou_primary_plane_prepare_fb(struct drm_plane *plane, return ret; } + vps->dmabuf_size = size; + /* * TTM already thinks the buffer is pinned, but make sure the * pin_count is upped. |
