On Mon, Nov 25, 2013 at 09:54:42AM -0800, Ben Widawsky wrote: > 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@xxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_gem.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 6388706..d85bc3e 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4504,6 +4504,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); Sprinkling stuff all over the place feels bad, I guess our gem init code is ripe for an overhaul. I've pulled this in anyway. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx