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

parents 8e592eab 575f9c86

drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -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;