svn commit: r251030 - user/attilio/vmobj-readlock/sys/dev/drm2/i915

[Attilio Rao]

Author: attilio
Date: Mon May 27 16:16:28 2013
New Revision: 251030
URL: http://svnweb.freebsd.org/changeset/base/251030

Log:
  Fixup vm_page_sleep_if_busy() locking for this branch.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/attilio/vmobj-readlock/sys/dev/drm2/i915/i915_gem.c

Modified: user/attilio/vmobj-readlock/sys/dev/drm2/i915/i915_gem.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/dev/drm2/i915/i915_gem.c	Mon May 27 16:12:39 2013	(r251029)
+++ user/attilio/vmobj-readlock/sys/dev/drm2/i915/i915_gem.c	Mon May 27 16:16:28 2013	(r251030)
@@ -2312,17 +2312,14 @@ i915_gem_release_mmap(struct drm_i915_ge
 	if (devobj != NULL) {
 		page_count = OFF_TO_IDX(obj->base.size);
 
-retry:
 		VM_OBJECT_WLOCK(devobj);
+retry:
 		for (i = 0; i < page_count; i++) {
 			m = vm_page_lookup(devobj, i);
 			if (m == NULL)
 				continue;
-			vm_page_lock(m);
-			VM_OBJECT_WUNLOCK(devobj);
 			if (vm_page_sleep_if_busy(m, "915unm"))
 				goto retry;
-			vm_page_unlock(m);
 			cdev_pager_free_page(devobj, m);
 		}
 		VM_OBJECT_WUNLOCK(devobj);