From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 7 Nov 2010 09:18:22 +0000 (+0000)
Subject: drm/i915: Handle GPU hangs during fault gracefully.
X-Git-Tag: v2.6.38-rc1~419^2~23^2~122
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=045e769ab69ce94dedbcdcfd46c2578b385c2986;p=karo-tx-linux.git

drm/i915: Handle GPU hangs during fault gracefully.

Instead of killing the process, just return no page found and reschedule
the process giving the GPU some time to (hopefully) recover.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 47c665eeaf17..7c91bf2bbdfd 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1340,11 +1340,12 @@ unlock:
 	mutex_unlock(&dev->struct_mutex);
 
 	switch (ret) {
+	case -EAGAIN:
+		set_need_resched();
 	case 0:
 	case -ERESTARTSYS:
 		return VM_FAULT_NOPAGE;
 	case -ENOMEM:
-	case -EAGAIN:
 		return VM_FAULT_OOM;
 	default:
 		return VM_FAULT_SIGBUS;