From owner-svn-src-user@FreeBSD.ORG  Mon May 27 16:16:28 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A233EEDC;
 Mon, 27 May 2013 16:16:28 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 94E23CDC;
 Mon, 27 May 2013 16:16:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RGGSmX061927;
 Mon, 27 May 2013 16:16:28 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RGGSaK061926;
 Mon, 27 May 2013 16:16:28 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201305271616.r4RGGSaK061926@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 27 May 2013 16:16:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r251030 - user/attilio/vmobj-readlock/sys/dev/drm2/i915
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 May 2013 16:16:28 -0000

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);