diff options
| author | Dave Airlie | 2015-10-02 02:46:51 +0200 |
|---|---|---|
| committer | Dave Airlie | 2015-10-02 02:46:51 +0200 |
| commit | 62886a367b59d7740f9db89fd418ab3e450ab7c7 (patch) | |
| tree | ecb688ef9a5943715cb7c55373aeebc4256a9ac1 /drivers/gpu/drm | |
| parent | Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | drm/vmwgfx: Fix a command submission hang regression (diff) | |
| download | kernel-qcow2-linux-62886a367b59d7740f9db89fd418ab3e450ab7c7.tar.gz kernel-qcow2-linux-62886a367b59d7740f9db89fd418ab3e450ab7c7.tar.xz kernel-qcow2-linux-62886a367b59d7740f9db89fd418ab3e450ab7c7.zip | |
Merge tag 'vmwgfx-fixes-4.3-151001' of git://people.freedesktop.org/~thomash/linux into drm-fixes
A single commit to fix a command submission hang regression.
Pull request of 2015-10-01
* tag 'vmwgfx-fixes-4.3-151001' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Fix a command submission hang regression
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c index 5ae8f921da2a..8a76821177a6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c @@ -681,6 +681,14 @@ static bool vmw_cmdbuf_try_alloc(struct vmw_cmdbuf_man *man, 0, 0, DRM_MM_SEARCH_DEFAULT, DRM_MM_CREATE_DEFAULT); + if (ret) { + (void) vmw_cmdbuf_man_process(man); + ret = drm_mm_insert_node_generic(&man->mm, info->node, + info->page_size, 0, 0, + DRM_MM_SEARCH_DEFAULT, + DRM_MM_CREATE_DEFAULT); + } + spin_unlock_bh(&man->lock); info->done = !ret; |