drm/i915: Takedown drm_mm on failed gtt setup
authorBen Widawsky <benjamin.widawsky@intel.com>
Fri, 6 Dec 2013 22:10:50 +0000 (14:10 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 18 Dec 2013 14:27:45 +0000 (15:27 +0100)
This was found by code inspection. If the GTT setup fails then we are
left without properly tearing down the drm_mm.

Hopefully this never happens.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem.c

index 360b68fbef6df0f252c142e563380192a2019bcc..11141590eda05f3cb3aa2c5589e50499da8c2e91 100644 (file)
@@ -4508,6 +4508,7 @@ int i915_gem_init(struct drm_device *dev)
        mutex_unlock(&dev->struct_mutex);
        if (ret) {
                i915_gem_cleanup_aliasing_ppgtt(dev);
+               drm_mm_takedown(&dev_priv->gtt.base.mm);
                return ret;
        }