Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+8
+8
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
··· 681 681 0, 0, 682 682 DRM_MM_SEARCH_DEFAULT, 683 683 DRM_MM_CREATE_DEFAULT); 684 + if (ret) { 685 + (void) vmw_cmdbuf_man_process(man); 686 + ret = drm_mm_insert_node_generic(&man->mm, info->node, 687 + info->page_size, 0, 0, 688 + DRM_MM_SEARCH_DEFAULT, 689 + DRM_MM_CREATE_DEFAULT); 690 + } 691 + 684 692 spin_unlock_bh(&man->lock); 685 693 info->done = !ret; 686 694