Commit b9201c14 authored by Eric Anholt's avatar Eric Anholt

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

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent a13e4093
...@@ -1240,6 +1240,10 @@ void i915_hangcheck_elapsed(unsigned long data) ...@@ -1240,6 +1240,10 @@ void i915_hangcheck_elapsed(unsigned long data)
drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_private_t *dev_priv = dev->dev_private;
uint32_t acthd; uint32_t acthd;
/* No reset support on this chip yet. */
if (IS_GEN6(dev))
return;
if (!IS_I965G(dev)) if (!IS_I965G(dev))
acthd = I915_READ(ACTHD); acthd = I915_READ(ACTHD);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment