drm/i915: Only call mod_timer() if not already pending
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 20 Nov 2014 20:10:33 +0000 (20:10 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 20 Nov 2014 21:48:34 +0000 (22:48 +0100)
The final arrangement of updating timer->expires and calling mod_timer()
used in

commit 672e7b7c1849c904b2c55185906b3940843c55c6
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Nov 19 09:47:19 2014 +0000

    drm/i915: Don't continually defer the hangcheck

turns out to be very unsafe. Try again.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c

Simple merge