aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i915_dma.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-03-30 07:53:58 +1000
committerDave Airlie <airlied@linux.ie>2008-03-30 07:53:58 +1000
commit144a75fa1faa4a81530bded2e59872ef80d496b6 (patch)
tree34caab94365cd11ad39a0e551f68072db79c97fd /drivers/char/drm/i915_dma.c
parentdrm/r300: fix bug in r300 userspace hardware wait emission (diff)
downloadlinux-dev-144a75fa1faa4a81530bded2e59872ef80d496b6.tar.xz
linux-dev-144a75fa1faa4a81530bded2e59872ef80d496b6.zip
drm/i915: fix oops on agp=off
From Kernel BZ 10289 - not sure why anyone would boot an intel with no agp but it shouldn't crash. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to '')
-rw-r--r--drivers/char/drm/i915_dma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index e9d6663bec73..a043bb12301a 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -804,6 +804,9 @@ void i915_driver_lastclose(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;
+ if (!dev_priv)
+ return;
+
if (dev_priv->agp_heap)
i915_mem_takedown(&(dev_priv->agp_heap));