d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Fix page fault handler failure

Browse Source 
... 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>
This commit is contained in:
Jean-Sébastien Pédron 2016-03-12 11:54:58 +00:00
parent 85a60a7756
commit 538cf7be5e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/drm2/i915/i915_gem.c
View File

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