3 files changed, 24 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d839e4c24d69..6c3a0bb91851 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1336,6 +1336,8 @@ i915_gem_object_unpin_fence(struct drm_i915_gem_object *obj)
 
 void i915_gem_retire_requests(struct drm_device *dev);
 void i915_gem_retire_requests_ring(struct intel_ring_buffer *ring);
+int __must_check i915_gem_check_wedge(struct drm_i915_private *dev_priv,
+                                      bool interruptible);
 
 void i915_gem_reset(struct drm_device *dev);
 void i915_gem_clflush_object(struct drm_i915_gem_object *obj);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6a98c0659324..af6a510367af 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1863,11 +1863,10 @@ i915_gem_retire_work_handler(struct work_struct *work)
         mutex_unlock(&dev->struct_mutex);
 }
 
-static int
-i915_gem_check_wedge(struct drm_i915_private *dev_priv)
+int
+i915_gem_check_wedge(struct drm_i915_private *dev_priv,
+                     bool interruptible)
 {
-        BUG_ON(!mutex_is_locked(&dev_priv->dev->struct_mutex));
-
         if (atomic_read(&dev_priv->mm.wedged)) {
                 struct completion *x = &dev_priv->error_completion;
                 bool recovery_complete;
@@ -1878,7 +1877,16 @@ i915_gem_check_wedge(struct drm_i915_private *dev_priv)
                 recovery_complete = x->done > 0;
                 spin_unlock_irqrestore(&x->wait.lock, flags);
 
-                return recovery_complete ? -EIO : -EAGAIN;
+                /* Non-interruptible callers can't handle -EAGAIN, hence return
+                 * -EIO unconditionally for these. */
+                if (!interruptible)
+                        return -EIO;
+
+                /* Recovery complete, but still wedged means reset failure. */
+                if (recovery_complete)
+                        return -EIO;
+
+                return -EAGAIN;
         }
 
         return 0;
@@ -1932,6 +1940,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,
         unsigned long timeout_jiffies;
         long end;
         bool wait_forever = true;
+        int ret;
 
         if (i915_seqno_passed(ring->get_seqno(ring), seqno))
                 return 0;
@@ -1963,8 +1972,9 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,
                         end = wait_event_timeout(ring->irq_queue, EXIT_COND,
                                                  timeout_jiffies);
 
-                if (atomic_read(&dev_priv->mm.wedged))
-                        end = -EAGAIN;
+                ret = i915_gem_check_wedge(dev_priv, interruptible);
+                if (ret)
+                        end = ret;
         } while (end == 0 && wait_forever);
 
         getrawmonotonic(&now);
@@ -2004,7 +2014,7 @@ i915_wait_seqno(struct intel_ring_buffer *ring, uint32_t seqno)
 
         BUG_ON(seqno == 0);
 
-        ret = i915_gem_check_wedge(dev_priv);
+        ret = i915_gem_check_wedge(dev_priv, dev_priv->mm.interruptible);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index dce4d1a492a8..cd35ad4922de 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1228,8 +1228,10 @@ int intel_wait_ring_buffer(struct intel_ring_buffer *ring, int n)
                 }
 
                 msleep(1);
-                if (atomic_read(&dev_priv->mm.wedged))
-                        return -EAGAIN;
+
+                ret = i915_gem_check_wedge(dev_priv, dev_priv->mm.interruptible);
+                if (ret)
+                        return ret;
         } while (!time_after(jiffies, end));
         trace_i915_ring_wait_end(ring);
         return -EBUSY;