summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2017-01-23 12:37:24 +0300
committerChris Wilson <chris@chris-wilson.co.uk>2017-01-23 14:19:33 +0300
commit2f1ac9cc68e0ca569405bd854979aa7eb787f774 (patch)
tree6bccc117a47fd5bb6f33d5f02857406d5851240c
parente27414a04f1a571eeb0b214ebfc77e6dc9bb8a08 (diff)
downloadlinux-2f1ac9cc68e0ca569405bd854979aa7eb787f774.tar.xz
drm/i915: Queue hangcheck when irqs are disabled
Ensure that the hangcheck is queued even in the absence of interrupts. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170123093724.18592-1-chris@chris-wilson.co.uk Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
-rw-r--r--drivers/gpu/drm/i915/intel_breadcrumbs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index fcfa423d08bd..c6fa77177615 100644
--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
@@ -127,6 +127,7 @@ static void __intel_breadcrumbs_enable_irq(struct intel_breadcrumbs *b)
if (!b->irq_enabled ||
test_bit(engine->id, &i915->gpu_error.missed_irq_rings)) {
mod_timer(&b->fake_irq, jiffies + 1);
+ i915_queue_hangcheck(i915);
} else {
/* Ensure we never sleep indefinitely */
GEM_BUG_ON(!time_after(b->timeout, jiffies));