From: Karsten Wiese <fzu@wemgehoertderstaat.de>
Date: Mon, 23 Feb 2009 14:07:57 +0000 (+0100)
Subject: Fix an oops in i915_gem_retire_requests()
X-Git-Tag: v2.6.29-rc7~68
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c0594a306790ab03db345086c0c6c922a900bf6;p=platform%2Fkernel%2Flinux-3.10.git

Fix an oops in i915_gem_retire_requests()

dev_priv->hw_status_page can be NULL, if i915_gem_retire_requests()
is called from i915_gem_busy_ioctl().

Signed-off-by Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 25b33743..28b726d 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/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)) {