From b9201c14d9c22fb3b3f313f69ee4f967353ca960 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 8 Jan 2010 14:25:16 -0800 Subject: [PATCH] drm/i915: Disable the hangcheck reset on Sandybridge until we add support. Signed-off-by: Eric Anholt --- drivers/gpu/drm/i915/i915_irq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index ef79d94..f93f822 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1239,7 +1239,11 @@ void i915_hangcheck_elapsed(unsigned long data) struct drm_device *dev = (struct drm_device *)data; drm_i915_private_t *dev_priv = dev->dev_private; uint32_t acthd; - + + /* No reset support on this chip yet. */ + if (IS_GEN6(dev)) + return; + if (!IS_I965G(dev)) acthd = I915_READ(ACTHD); else -- 2.7.4