drm/i915: Disable the hangcheck reset on Sandybridge until we add support.
Eric Anholt [Fri, 8 Jan 2010 22:25:16 +0000 (14:25 -0800)]
Signed-off-by: Eric Anholt <eric@anholt.net>

drivers/gpu/drm/i915/i915_irq.c

index ef79d94..f93f822 100644 (file)
@@ -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