diff options
| author | Zhenyu Wang | 2009-12-17 09:12:56 +0100 |
|---|---|---|
| committer | Eric Anholt | 2009-12-17 20:17:38 +0100 |
| commit | c566ec49159b806db95a90fd8f37448376cd0ad2 (patch) | |
| tree | eb3e2d181ff059b13f262e8591a39669b3c5d481 | |
| parent | drm/i915: only enable hotplug for detected outputs (diff) | |
| download | kernel-qcow2-linux-c566ec49159b806db95a90fd8f37448376cd0ad2.tar.gz kernel-qcow2-linux-c566ec49159b806db95a90fd8f37448376cd0ad2.tar.xz kernel-qcow2-linux-c566ec49159b806db95a90fd8f37448376cd0ad2.zip | |
drm/i915: Reload hangcheck timer too for Ironlake
Make sure hangcheck timer won't beat us unexpectedly on Ironlake.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 1733eea87840..7cd8110051b6 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -313,6 +313,8 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev) dev_priv->mm.irq_gem_seqno = seqno; trace_i915_gem_request_complete(dev, seqno); DRM_WAKEUP(&dev_priv->irq_queue); + dev_priv->hangcheck_count = 0; + mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD); } if (de_iir & DE_GSE) |