---

yaml --- r: 178845 b: refs/heads/master c: c566ec4 h: refs/heads/master i: 178843: 558fc89 v: v3
git-mirror · Dec 17, 2009 · b3c37a4 · b3c37a4
1 parent dda355a
commit b3c37a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b01f2c3a4a37d09a47ad73ccbb46d554d21cfeb0
+refs/heads/master: c566ec49159b806db95a90fd8f37448376cd0ad2
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/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)