From: Chris Wilson Date: Thu, 20 Jan 2011 09:52:56 +0000 (+0000) Subject: drm/i915: Don't kick-off hangcheck after a DRI interrupt X-Git-Tag: v3.0~1811^2~4^2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=475553de2fc861d53396dd8fd14cc22f30ab97ab;p=platform%2Fkernel%2Flinux-amlogic.git drm/i915: Don't kick-off hangcheck after a DRI interrupt Hangcheck and error recovery is only used by GEM. Reported-by: Herbert Xu Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index b8e509a..f0c87bd 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, struct intel_ring_buffer *ring) { struct drm_i915_private *dev_priv = dev->dev_private; - u32 seqno = ring->get_seqno(ring); + u32 seqno; + + if (ring->obj == NULL) + return; + seqno = ring->get_seqno(ring); trace_i915_gem_request_complete(dev, seqno); ring->irq_seqno = seqno;