projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7ab9b4
)
drm/i915: Don't kick-off hangcheck after a DRI interrupt
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 20 Jan 2011 09:52:56 +0000
(09:52 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 20 Jan 2011 11:21:16 +0000
(11:21 +0000)
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>
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
b8e509a
..
f0c87bd
100644
(file)
--- 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;