drm/i915: Disable the hangcheck reset on Sandybridge until we add sup…

…port. Signed-off-by: Eric Anholt <eric@anholt.net>
git-mirror · Feb 26, 2010 · b9201c1 · b9201c1
1 parent a13e409
commit b9201c1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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