From: Eric Anholt <eric@anholt.net>
Date: Fri, 8 Jan 2010 22:25:16 +0000 (-0800)
Subject: drm/i915: Disable the hangcheck reset on Sandybridge until we add support.
X-Git-Tag: MMI-PSA29.97-13-9~23984^2~101^2~12
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9201c14d9c22fb3b3f313f69ee4f967353ca960;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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 ef79d9423f0a..f93f822fa72c 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