[Nouveau] [PATCH] drm/nouveau: fix nouveau_mm/nouveau_mm_node leak

[Ben Skeggs]

On Mon, Oct 22, 2012 at 12:19:35AM +0200, Marcin Slusarz wrote:
> On Fri, Oct 19, 2012 at 04:05:14PM +1000, Ben Skeggs wrote:
> > On Thu, Oct 11, 2012 at 11:53:09PM +0200, Marcin Slusarz wrote:
> > > Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
> > > ---
> > >  drivers/gpu/drm/nouveau/core/core/gpuobj.c         | 6 +++++-
> > >  drivers/gpu/drm/nouveau/core/include/core/gpuobj.h | 3 +++
> > >  2 files changed, 8 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/gpu/drm/nouveau/core/core/gpuobj.c b/drivers/gpu/drm/nouveau/core/core/gpuobj.c
> > > index c2a7608..48121d2 100644
> > > --- a/drivers/gpu/drm/nouveau/core/core/gpuobj.c
> > > +++ b/drivers/gpu/drm/nouveau/core/core/gpuobj.c
> > > @@ -39,8 +39,11 @@ nouveau_gpuobj_destroy(struct nouveau_gpuobj *gpuobj)
> > >  			nv_wo32(gpuobj, i, 0x00000000);
> > >  	}
> > >  
> > > +	if (gpuobj->node)
> > > +		nouveau_mm_free(gpuobj->node_heap, &gpuobj->node);
> > > +
> > if (gpuobj->node) {
> > 	nouveau_mm_free(&nv_gpuobj(gpuobj->parent)->heap,
> > 			&gpuobj->node);
> > }
> > 
> > Or something to that effect, instead of having to store the heap
> > pointer again.
Thanks, merged both patches :)

> 
> Oh, right.
> (Somehow I assumed pargpu to be different object than parent when
> I first read it.)
> 
> > >  	if (gpuobj->heap.block_size)
> > > -		nouveau_mm_fini(&gpuobj->heap);
> > > +		WARN_ON(nouveau_mm_fini(&gpuobj->heap));
> > Alright, I get this.  However, perhaps we should go the full hog here
> > and make nouveau_mm_fini() directly do the WARN_ON() in this situation?
> > 
> > There was, once upon a time, reasons for it not doing this, I don't
> > believe they're valid anymore though.
> 
> OK.
> 
> Marcin