| From c566ec49159b806db95a90fd8f37448376cd0ad2 Mon Sep 17 00:00:00 2001 |
| From: Zhenyu Wang <zhenyuw@linux.intel.com> |
| Date: Thu, 17 Dec 2009 16:12:56 +0800 |
| Subject: drm/i915: Reload hangcheck timer too for Ironlake |
| |
| From: Zhenyu Wang <zhenyuw@linux.intel.com> |
| |
| commit c566ec49159b806db95a90fd8f37448376cd0ad2 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/gpu/drm/i915/i915_irq.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/gpu/drm/i915/i915_irq.c |
| +++ b/drivers/gpu/drm/i915/i915_irq.c |
| @@ -282,6 +282,8 @@ irqreturn_t igdng_irq_handler(struct drm |
| 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); |
| } |
| |
| I915_WRITE(GTIIR, gt_iir); |
