From owner-svn-src-all@FreeBSD.ORG  Mon May 28 21:15:55 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 32950106566B;
	Mon, 28 May 2012 21:15:55 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D78F8FC12;
	Mon, 28 May 2012 21:15:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4SLFsSe033856;
	Mon, 28 May 2012 21:15:54 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4SLFscQ033854;
	Mon, 28 May 2012 21:15:54 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201205282115.q4SLFscQ033854@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Mon, 28 May 2012 21:15:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236199 - head/sys/dev/drm2/i915
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 May 2012 21:15:55 -0000

Author: alc
Date: Mon May 28 21:15:54 2012
New Revision: 236199
URL: http://svn.freebsd.org/changeset/base/236199

Log:
  A small simplification to i915_gem_pager_fault().
  
  Reviewed by:	kib

Modified:
  head/sys/dev/drm2/i915/i915_gem.c

Modified: head/sys/dev/drm2/i915/i915_gem.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_gem.c	Mon May 28 20:44:11 2012	(r236198)
+++ head/sys/dev/drm2/i915/i915_gem.c	Mon May 28 21:15:54 2012	(r236199)
@@ -1421,7 +1421,7 @@ unlocked_vmobj:
 
 	if ((m->flags & VPO_BUSY) != 0) {
 		DRM_UNLOCK(dev);
-		vm_page_sleep_if_busy(m, false, "915pbs");
+		vm_page_sleep(m, "915pbs");
 		goto retry;
 	}
 	m->valid = VM_PAGE_BITS_ALL;