summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKarsten Wiese <fzu@wemgehoertderstaat.de>2009-02-23 15:07:57 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-23 17:14:47 -0800
commit6c0594a306790ab03db345086c0c6c922a900bf6 (patch)
treedc24b2838aabd8f6e52009c91f18720c2559f344 /drivers
parentea5a42c22ee123dfc8fa34c421cf95d6235e54d9 (diff)
downloadlinux-3.10-6c0594a306790ab03db345086c0c6c922a900bf6.tar.gz
linux-3.10-6c0594a306790ab03db345086c0c6c922a900bf6.tar.bz2
linux-3.10-6c0594a306790ab03db345086c0c6c922a900bf6.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 25b337438ca..28b726d07a0 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)) {