summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJimmy Rentz <jb17bsome@gmail.com>2011-04-17 22:15:03 +0200
committerBen Skeggs <bskeggs@redhat.com>2011-05-16 02:49:58 +0200
commit2abdb057e45ea9b558653a97d979053cfdd1a04a (patch)
tree069497e372d6bad46ede0a698c71ba7151da5808 /drivers
parentdrm/nva3: somewhat improve clock reporting (diff)
downloadlinux-2abdb057e45ea9b558653a97d979053cfdd1a04a.tar.xz
linux-2abdb057e45ea9b558653a97d979053cfdd1a04a.zip
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@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/nv04_instmem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
index b8e3edb5c063..b8611b955313 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