svn commit: r265437 - stable/10/sys/dev/drm2/i915

[Konstantin Belousov]

Author: kib
Date: Tue May  6 12:31:25 2014
New Revision: 265437
URL: http://svnweb.freebsd.org/changeset/base/265437

Log:
  MFC r265102:
  Fix two cases of recursive acquisitions of the vm object lock, only
  possible in rare failure situations.

Modified:
  stable/10/sys/dev/drm2/i915/i915_gem.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/drm2/i915/i915_gem.c
==============================================================================
--- stable/10/sys/dev/drm2/i915/i915_gem.c	Tue May  6 12:31:17 2014	(r265436)
+++ stable/10/sys/dev/drm2/i915/i915_gem.c	Tue May  6 12:31:25 2014	(r265437)
@@ -1431,6 +1431,7 @@ retry:
 	m = vm_phys_fictitious_to_vm_page(dev->agp->base + obj->gtt_offset +
 	    offset);
 	if (m == NULL) {
+		VM_OBJECT_WUNLOCK(vm_obj);
 		cause = 60;
 		ret = -EFAULT;
 		goto unlock;
@@ -1450,7 +1451,6 @@ retry:
 		DRM_UNLOCK(dev);
 		VM_OBJECT_WUNLOCK(vm_obj);
 		VM_WAIT;
-		VM_OBJECT_WLOCK(vm_obj);
 		goto retry;
 	}
 	m->valid = VM_PAGE_BITS_ALL;