drm/i915: don't leak struct_mutex lock on ppgtt init failures
Daniel Vetter [Mon, 2 Apr 2012 21:33:03 +0000 (23:33 +0200)]
Reported-by: Konstantin Belousov <kostikbel@gmail.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

drivers/gpu/drm/i915/i915_dma.c

index 8a62285..785f67f 100644 (file)
@@ -1222,8 +1222,10 @@ static int i915_load_gem_init(struct drm_device *dev)
                i915_gem_do_init(dev, 0, mappable_size, gtt_size);
 
                ret = i915_gem_init_aliasing_ppgtt(dev);
-               if (ret)
+               if (ret) {
+                       mutex_unlock(&dev->struct_mutex);
                        return ret;
+               }
        } else {
                /* Let GEM Manage all of the aperture.
                 *