git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nv04_instmem.c
diff --git
a/drivers/gpu/drm/nouveau/nv04_instmem.c
b/drivers/gpu/drm/nouveau/nv04_instmem.c
index
b8e3edb
..
b8611b9
100644
(file)
--- 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