diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2018-02-08 17:54:00 -0800 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2018-02-08 17:54:33 -0800 |
| commit | f02828f64918f545d149854da3cc191a73451510 (patch) | |
| tree | 170b27b23dabf69b9e0ccf1482ab37820c5cd467 /drivers/gpu/drm/i915/intel_breadcrumbs.c | |
| parent | b2d1bd024f9c6074237c2ee349e631b886ae31d9 (diff) | |
| parent | 94fc27ac487a80daf42f97b1a0503d029f3c1325 (diff) | |
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-next-4.16
Pulled commit 94fc27ac487a80daf42f97b1a0503d029f3c1325.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_breadcrumbs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_breadcrumbs.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c index 58c624f982d9..bd40fea16b4f 100644 --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c @@ -149,17 +149,6 @@ static void intel_breadcrumbs_fake_irq(struct timer_list *t) return; mod_timer(&b->fake_irq, jiffies + 1); - - /* Ensure that even if the GPU hangs, we get woken up. - * - * However, note that if no one is waiting, we never notice - * a gpu hang. Eventually, we will have to wait for a resource - * held by the GPU and so trigger a hangcheck. In the most - * pathological case, this will be upon memory starvation! To - * prevent this, we also queue the hangcheck from the retire - * worker. - */ - i915_queue_hangcheck(engine->i915); } static void irq_enable(struct intel_engine_cs *engine) |