---

yaml --- r: 232331 b: refs/heads/master c: 475553d h: refs/heads/master i: 232329: dc50a3c 232327: edebfc5 v: v3
git-mirror · Jan 20, 2011 · 340e495 · 340e495
1 parent 00ecaae
commit 340e495
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7ab9b407b3bc83161c2aa74c992ba4782e87c9c
+refs/heads/master: 475553de2fc861d53396dd8fd14cc22f30ab97ab
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/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;