From: Zhenyu Wang Date: Thu, 17 Dec 2009 08:12:56 +0000 (+0800) Subject: drm/i915: Reload hangcheck timer too for Ironlake X-Git-Tag: v2.6.33-rc4~76^2~12 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=c566ec49159b806db95a90fd8f37448376cd0ad2;p=net-next-2.6.git drm/i915: Reload hangcheck timer too for Ironlake Make sure hangcheck timer won't beat us unexpectedly on Ironlake. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 1733eea8784..7cd8110051b 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)