Commit f527a38e authored by Chris Wilson's avatar Chris Wilson

drm/i915: Update the breadcrumb interrupt counter before enabling

In order to close a race with a long running hangcheck comparing a stale
interrupt counter with a just started waiter, we need to first bump the
counter as we start the fresh wait.

References: https://bugs.freedesktop.org/show_bug.cgi?id=96974Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469351421-13493-2-git-send-email-chris@chris-wilson.co.uk
parent 2529d570
...@@ -51,6 +51,13 @@ static void irq_enable(struct intel_engine_cs *engine) ...@@ -51,6 +51,13 @@ static void irq_enable(struct intel_engine_cs *engine)
*/ */
engine->breadcrumbs.irq_posted = true; engine->breadcrumbs.irq_posted = true;
/* Make sure the current hangcheck doesn't falsely accuse a just
* started irq handler from missing an interrupt (because the
* interrupt count still matches the stale value from when
* the irq handler was disabled, many hangchecks ago).
*/
engine->breadcrumbs.irq_wakeups++;
spin_lock_irq(&engine->i915->irq_lock); spin_lock_irq(&engine->i915->irq_lock);
engine->irq_enable(engine); engine->irq_enable(engine);
spin_unlock_irq(&engine->i915->irq_lock); spin_unlock_irq(&engine->i915->irq_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment