diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-20 04:52:56 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-20 06:21:16 -0500 |
commit | 475553de2fc861d53396dd8fd14cc22f30ab97ab (patch) | |
tree | 927e0d19fcd0bde75128b2845eaa62ffc9cc1efb /drivers/gpu/drm/i915/i915_irq.c | |
parent | f7ab9b407b3bc83161c2aa74c992ba4782e87c9c (diff) |
drm/i915: Don't kick-off hangcheck after a DRI interrupt
Hangcheck and error recovery is only used by GEM.
Reported-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-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 b8e509ae065e..f0c87bdfa6fa 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -348,8 +348,12 @@ static void notify_ring(struct drm_device *dev, | |||
348 | struct intel_ring_buffer *ring) | 348 | struct intel_ring_buffer *ring) |
349 | { | 349 | { |
350 | struct drm_i915_private *dev_priv = dev->dev_private; | 350 | struct drm_i915_private *dev_priv = dev->dev_private; |
351 | u32 seqno = ring->get_seqno(ring); | 351 | u32 seqno; |
352 | |||
353 | if (ring->obj == NULL) | ||
354 | return; | ||
352 | 355 | ||
356 | seqno = ring->get_seqno(ring); | ||
353 | trace_i915_gem_request_complete(dev, seqno); | 357 | trace_i915_gem_request_complete(dev, seqno); |
354 | 358 | ||
355 | ring->irq_seqno = seqno; | 359 | ring->irq_seqno = seqno; |