---

yaml --- r: 334715 b: refs/heads/master c: 92485ce h: refs/heads/master i: 334713: fe3a783 334711: c1c001c v: v3
git-mirror · Oct 22, 2012 · b88be94 · b88be94
1 parent 99e88b0
commit b88be94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90e2889c4e24e2bde8f226402b46c66e18162860
+refs/heads/master: 92485cef52c2de0f98efdf527ea39cef2b9fc416
diff --git a/trunk/drivers/gpu/drm/nouveau/core/core/gpuobj.c b/trunk/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);