diff options
| author | Eric Anholt <eric@anholt.net> | 2010-01-08 14:25:16 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-02-26 13:23:20 -0800 |
| commit | b9201c14d9c22fb3b3f313f69ee4f967353ca960 (patch) | |
| tree | b3992b23e9f822cf5985530a696d0ae3ab0fe307 /drivers | |
| parent | a13e4093cbd3db91cc65ac8b8c2baadffa603ee9 (diff) | |
| download | linux-stable-b9201c14d9c22fb3b3f313f69ee4f967353ca960.tar.gz linux-stable-b9201c14d9c22fb3b3f313f69ee4f967353ca960.tar.bz2 linux-stable-b9201c14d9c22fb3b3f313f69ee4f967353ca960.zip | |
drm/i915: Disable the hangcheck reset on Sandybridge until we add support.
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 |