From b392e9aa3db1b943aee3bb34a3feb3bf4ed3e133 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 16 Apr 2009 13:46:12 -0700
Subject: [PATCH] --- yaml --- r: 144303 b: refs/heads/master c:
 07f4f8bf436e3f389a12cb792ad16275b9091b51 h: refs/heads/master i:   144301:
 12cb662a86519e9559e71440aea130c59d719eb7   144299:
 f91b80cdf8d1012e0077b4b623786409536f8f16   144295:
 780136397760cdac13eaf6dc3273bb2dbfe415e6   144287:
 1484827d60017f5aad7c94254342a3dc5cc5a7e7 v: v3

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

diff --git a/[refs] b/[refs]
index 79a415cc1459..9c5e99e7adc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f544847fbaf099278343f875987a983f2b913134
+refs/heads/master: 07f4f8bf436e3f389a12cb792ad16275b9091b51
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
index ee7ce7b78cf7..98bb4c878c4e 100644
--- a/trunk/drivers/gpu/drm/i915/i915_irq.c
+++ b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -406,7 +406,7 @@ int i915_irq_emit(struct drm_device *dev, void *data,
 	drm_i915_irq_emit_t *emit = data;
 	int result;
 
-	if (!dev_priv) {
+	if (!dev_priv || !dev_priv->ring.virtual_start) {
 		DRM_ERROR("called with no initialization\n");
 		return -EINVAL;
 	}