---

yaml --- r: 318661 b: refs/heads/master c: a9340cc h: refs/heads/master i: 318659: 9d15a45 v: v3
git-mirror · Jul 5, 2012 · c2fd92f · c2fd92f
1 parent 740cbb3
commit c2fd92f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a6759c6bacb3998e3d9a7cf690177051238ad87
+refs/heads/master: a9340ccab547f24e3b398b7e3ebd792827ff1be1
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1141,6 +1141,11 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 out:
 	switch (ret) {
 	case -EIO:
+		/* If this -EIO is due to a gpu hang, give the reset code a
+		 * chance to clean up the mess. Otherwise return the proper
+		 * SIGBUS. */
+		if (!atomic_read(&dev_priv->mm.wedged))
+			return VM_FAULT_SIGBUS;
 	case -EAGAIN:
 		/* Give the error handler a chance to run and move the
 		 * objects off the GPU active list. Next time we service the