From ac25a9f2cd4b7d19945352dcf1fe63a2c0a3a63e Mon Sep 17 00:00:00 2001
From: Karsten Wiese <fzu@wemgehoertderstaat.de>
Date: Mon, 23 Feb 2009 15:07:57 +0100
Subject: [PATCH] --- yaml --- r: 131709 b: refs/heads/master c:
 6c0594a306790ab03db345086c0c6c922a900bf6 h: refs/heads/master i:   131707:
 8f6cabe9231d8dc3bc7b521f7d5b3da397e2996b v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index da46056ccd2c..8e5fcab433f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea5a42c22ee123dfc8fa34c421cf95d6235e54d9
+refs/heads/master: 6c0594a306790ab03db345086c0c6c922a900bf6
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 25b337438ca7..28b726d07a0c 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1051,6 +1051,9 @@ i915_gem_retire_requests(struct drm_device *dev)
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	uint32_t seqno;
 
+	if (!dev_priv->hw_status_page)
+		return;
+
 	seqno = i915_get_gem_seqno(dev);
 
 	while (!list_empty(&dev_priv->mm.request_list)) {