lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt
2010-01-08 14:25:16 -08:00
parent a13e4093cb
commit b9201c14d9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_irq.c
View File

@@ -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