|
@@ -1390,14 +1390,11 @@ out:
|
|
|
if (i915_terminally_wedged(&dev_priv->gpu_error))
|
|
|
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
|
|
|
- * fault, we should be able to transition the page into the
|
|
|
- * GTT without touching the GPU (and so avoid further
|
|
|
- * EIO/EGAIN). If the GPU is wedged, then there is no issue
|
|
|
- * with coherency, just lost writes.
|
|
|
+ /*
|
|
|
+ * EAGAIN means the gpu is hung and we'll wait for the error
|
|
|
+ * handler to reset everything when re-faulting in
|
|
|
+ * i915_mutex_lock_interruptible.
|
|
|
*/
|
|
|
- set_need_resched();
|
|
|
case 0:
|
|
|
case -ERESTARTSYS:
|
|
|
case -EINTR:
|