projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
90e2889
)
drm/nouveau: fix nouveau_mm/nouveau_mm_node leak
author
Marcin Slusarz
<marcin.slusarz@gmail.com>
Sun, 21 Oct 2012 22:20:32 +0000
(
00:20
+0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Mon, 22 Oct 2012 02:25:53 +0000
(12:25 +1000)
v2: use already existing parent
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/core/gpuobj.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/core/core/gpuobj.c
b/drivers/gpu/drm/nouveau/core/core/gpuobj.c
index 1f34549aff18748758d4d72feed0eba5800734ab..70586fde69cf48018fd9786ccccacd4eef0900d4 100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/core/gpuobj.c
+++ b/
drivers/gpu/drm/nouveau/core/core/gpuobj.c
@@
-39,6
+39,11
@@
nouveau_gpuobj_destroy(struct nouveau_gpuobj *gpuobj)
nv_wo32(gpuobj, i, 0x00000000);
}
+ if (gpuobj->node) {
+ nouveau_mm_free(&nv_gpuobj(gpuobj->parent)->heap,
+ &gpuobj->node);
+ }
+
if (gpuobj->heap.block_size)
nouveau_mm_fini(&gpuobj->heap);