Jimmy Rentz
2011-Apr-17 20:15 UTC
[Nouveau] [PATCH] drm/nouveau: Free nv04 instmem ramin heap at card takedown
Add a missing nv04 instmem ramin heap shutdown call.
Signed-off-by: Jimmy Rentz <jb17bsome at gmail.com>
diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c
b/drivers/gpu/drm/nouveau/nv04_instmem.c index b8e3edb..b8611b9 100644
--- a/drivers/gpu/drm/nouveau/nv04_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv04_instmem.c
@@ -95,6 +95,9 @@ nv04_instmem_takedown(struct drm_device *dev)
nouveau_ramht_ref(NULL, &dev_priv->ramht, NULL);
nouveau_gpuobj_ref(NULL, &dev_priv->ramro);
nouveau_gpuobj_ref(NULL, &dev_priv->ramfc);
+
+ if (drm_mm_initialized(&dev_priv->ramin_heap))
+ drm_mm_takedown(&dev_priv->ramin_heap);
}
int
Ben Skeggs
2011-Apr-17 23:01 UTC
[Nouveau] [PATCH] drm/nouveau: Free nv04 instmem ramin heap at card takedown
On Sun, 2011-04-17 at 16:15 -0400, Jimmy Rentz wrote:> Add a missing nv04 instmem ramin heap shutdown call.Thank you, pushed this and the vga_ram patch. Ben.> > Signed-off-by: Jimmy Rentz <jb17bsome at gmail.com> > > diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c > b/drivers/gpu/drm/nouveau/nv04_instmem.c index b8e3edb..b8611b9 100644 > --- a/drivers/gpu/drm/nouveau/nv04_instmem.c > +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c > @@ -95,6 +95,9 @@ nv04_instmem_takedown(struct drm_device *dev) > nouveau_ramht_ref(NULL, &dev_priv->ramht, NULL); > nouveau_gpuobj_ref(NULL, &dev_priv->ramro); > nouveau_gpuobj_ref(NULL, &dev_priv->ramfc); > + > + if (drm_mm_initialized(&dev_priv->ramin_heap)) > + drm_mm_takedown(&dev_priv->ramin_heap); > } > > int > _______________________________________________ > Nouveau mailing list > Nouveau at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau