3 files changed, 30 insertions, 48 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index c55b1f75c980..834240a9b262 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3309,16 +3309,6 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv)
 
 static void nop_submit_request(struct i915_request *request)
 {
-        GEM_TRACE("%s fence %llx:%d -> -EIO\n",
-                  request->engine->name,
-                  request->fence.context, request->fence.seqno);
-        dma_fence_set_error(&request->fence, -EIO);
-
-        i915_request_submit(request);
-}
-
-static void nop_complete_submit_request(struct i915_request *request)
-{
         unsigned long flags;
 
         GEM_TRACE("%s fence %llx:%d -> -EIO\n",
@@ -3354,57 +3344,33 @@ void i915_gem_set_wedged(struct drm_i915_private *i915)
          * rolling the global seqno forward (since this would complete requests
          * for which we haven't set the fence error to EIO yet).
          */
-        for_each_engine(engine, i915, id) {
+        for_each_engine(engine, i915, id)
                 i915_gem_reset_prepare_engine(engine);
 
-                engine->submit_request = nop_submit_request;
-                engine->schedule = NULL;
-        }
-        i915->caps.scheduler = 0;
-
         /* Even if the GPU reset fails, it should still stop the engines */
         if (INTEL_GEN(i915) >= 5)
                 intel_gpu_reset(i915, ALL_ENGINES);
 
-        /*
-         * Make sure no one is running the old callback before we proceed with
-         * cancelling requests and resetting the completion tracking. Otherwise
-         * we might submit a request to the hardware which never completes.
-         */
-        synchronize_rcu();
-
         for_each_engine(engine, i915, id) {
-                /* Mark all executing requests as skipped */
-                engine->cancel_requests(engine);
-
-                /*
-                 * Only once we've force-cancelled all in-flight requests can we
-                 * start to complete all requests.
-                 */
-                engine->submit_request = nop_complete_submit_request;
+                engine->submit_request = nop_submit_request;
+                engine->schedule = NULL;
         }
+        i915->caps.scheduler = 0;
 
         /*
          * Make sure no request can slip through without getting completed by
          * either this call here to intel_engine_init_global_seqno, or the one
-         * in nop_complete_submit_request.
+         * in nop_submit_request.
          */
         synchronize_rcu();
 
-        for_each_engine(engine, i915, id) {
-                unsigned long flags;
-
-                /*
-                 * Mark all pending requests as complete so that any concurrent
-                 * (lockless) lookup doesn't try and wait upon the request as we
-                 * reset it.
-                 */
-                spin_lock_irqsave(&engine->timeline.lock, flags);
-                intel_engine_init_global_seqno(engine,
-                                               intel_engine_last_submit(engine));
-                spin_unlock_irqrestore(&engine->timeline.lock, flags);
+        /* Mark all executing requests as skipped */
+        for_each_engine(engine, i915, id)
+                engine->cancel_requests(engine);
 
+        for_each_engine(engine, i915, id) {
                 i915_gem_reset_finish_engine(engine);
+                intel_engine_wakeup(engine);
         }
 
 out:
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 1f004683b777..87d42a2b9400 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -820,8 +820,11 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)
         /* Mark all executing requests as skipped. */
         list_for_each_entry(rq, &engine->timeline.requests, link) {
                 GEM_BUG_ON(!rq->global_seqno);
-                if (!i915_request_completed(rq))
-                        dma_fence_set_error(&rq->fence, -EIO);
+
+                if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &rq->fence.flags))
+                        continue;
+
+                dma_fence_set_error(&rq->fence, -EIO);
         }
 
         /* Flush the queued requests to the timeline list (for retiring). */
@@ -841,6 +844,10 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)
                         kmem_cache_free(engine->i915->priorities, p);
         }
 
+        intel_write_status_page(engine,
+                                I915_GEM_HWS_INDEX,
+                                intel_engine_last_submit(engine));
+
         /* Remaining _unready_ requests will be nop'ed when submitted */
 
         execlists->queue_priority = INT_MIN;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index d81eaf5f6b3e..81b10d85b738 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -755,9 +755,18 @@ static void cancel_requests(struct intel_engine_cs *engine)
         /* Mark all submitted requests as skipped. */
         list_for_each_entry(request, &engine->timeline.requests, link) {
                 GEM_BUG_ON(!request->global_seqno);
-                if (!i915_request_completed(request))
-                        dma_fence_set_error(&request->fence, -EIO);
+
+                if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT,
+                             &request->fence.flags))
+                        continue;
+
+                dma_fence_set_error(&request->fence, -EIO);
         }
+
+        intel_write_status_page(engine,
+                                I915_GEM_HWS_INDEX,
+                                intel_engine_last_submit(engine));
+
         /* Remaining _unready_ requests will be nop'ed when submitted */
 
         spin_unlock_irqrestore(&engine->timeline.lock, flags);