OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a13e409
)
drm/i915: Disable the hangcheck reset on Sandybridge until we add support.
author
Eric Anholt
<eric@anholt.net>
Fri, 8 Jan 2010 22:25:16 +0000
(14:25 -0800)
committer
Eric Anholt
<eric@anholt.net>
Fri, 26 Feb 2010 21:23:20 +0000
(13:23 -0800)
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/i915_irq.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_irq.c
b/drivers/gpu/drm/i915/i915_irq.c
index
ef79d94
..
f93f822
100644
(file)
--- 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