]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/i915: Reload hangcheck timer too for Ironlake
authorZhenyu Wang <zhenyuw@linux.intel.com>
Thu, 17 Dec 2009 08:12:56 +0000 (16:12 +0800)
committerEric Anholt <eric@anholt.net>
Thu, 17 Dec 2009 19:17:38 +0000 (11:17 -0800)
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>
drivers/gpu/drm/i915/i915_irq.c

index 1733eea87840d1d3ef2533e05262d7a7e0c73fc6..7cd8110051b6e22e26bc487418533c6b9f47d806 100644 (file)
@@ -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)