drm/i915: Cancel pending execlist tasklet upon wedging

Highly unlikely, but if the stop_machine() did suspend the tasklet, we
want to make sure that when it wakes it finds there is nothing to do.
Otherwise, it will loudly complain that the ELSP port tracking no longer
matches the hardware, and we will be mightly confused.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170621124804.4529-1-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1353491..ae3ce13 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3092,6 +3092,13 @@ static void engine_set_wedged(struct intel_engine_cs *engine)
                engine->execlist_first = NULL;
 
                spin_unlock_irqrestore(&engine->timeline->lock, flags);
+
+               /* The port is checked prior to scheduling a tasklet, but
+                * just in case we have suspended the tasklet to do the
+                * wedging make sure that when it wakes, it decides there
+                * is no work to do by clearing the irq_posted bit.
+                */
+               clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted);
        }
 }