From 340e495d3865e0ee3574fc108098286a8c0c9223 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 20 Jan 2011 09:52:56 +0000
Subject: [PATCH] --- yaml --- r: 232331 b: refs/heads/master c:
 475553de2fc861d53396dd8fd14cc22f30ab97ab h: refs/heads/master i:   232329:
 dc50a3ce5e99a05c87657d912578152fbb367443   232327:
 edebfc531363b3f3326c674ae26ee5b8a0b4fb25 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_irq.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 39576bda613a..613360208255 100644
--- 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
index b8e509ae065e..f0c87bdfa6fa 100644
--- 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;