drm/i915: Disable the hangcheck reset on Sandybridge until we add support.

Signed-off-by: Eric Anholt <eric@anholt.net>

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index ef79d9423f0af2ccfe3c9dedbff5f24ebc3c10c6..f93f822fa72c6dc044835845a829a96263ea2d48 100644 (file)
--- 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