From owner-svn-src-all@freebsd.org  Sat Mar 12 11:54:59 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EAAB6ACC325;
 Sat, 12 Mar 2016 11:54:59 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B7D8C6EB;
 Sat, 12 Mar 2016 11:54:59 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2CBswHD034031;
 Sat, 12 Mar 2016 11:54:58 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CBswhx034030;
 Sat, 12 Mar 2016 11:54:58 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201603121154.u2CBswhx034030@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org>
Date: Sat, 12 Mar 2016 11:54:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296720 - head/sys/dev/drm2/i915
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Mar 2016 11:55:00 -0000

Author: dumbbell
Date: Sat Mar 12 11:54:58 2016
New Revision: 296720
URL: https://svnweb.freebsd.org/changeset/base/296720

Log:
  drm/i915: Fix page fault handler failure
  
  ... when __wait_seqno() is interrupted by a signal. In this case,
  __wait_seqno() returns -ERESTARTSYS. Like we already do in drm_ioctl(),
  we need to convert this error to a common code such as -EINTR, so the
  page fault handler is restarted.
  
  Reported by:	Frederic Chardon <chardon.frederic@gmail.com>
  Tested by:	Frederic Chardon <chardon.frederic@gmail.com>

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	Sat Mar 12 09:44:23 2016	(r296719)
+++ head/sys/dev/drm2/i915/i915_gem.c	Sat Mar 12 11:54:58 2016	(r296720)
@@ -1619,6 +1619,13 @@ out:
 	KASSERT(ret != 0, ("i915_gem_pager_fault: wrong return"));
 	CTR4(KTR_DRM, "fault_fail %p %jx %x err %d", gem_obj, offset, prot,
 	    -ret);
+	if (ret == -ERESTARTSYS) {
+		/*
+		 * NOTE Linux<->FreeBSD: Convert Linux' -ERESTARTSYS to
+		 * the more common -EINTR, so the page fault is retried.
+		 */
+		ret = -EINTR;
+	}
 	if (ret == -EAGAIN || ret == -EIO || ret == -EINTR) {
 		kern_yield(PRI_USER);
 		goto retry;