From b88be94853fae709c2b04b22451c8b96f73af7df Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Mon, 22 Oct 2012 00:20:32 +0200
Subject: [PATCH] --- yaml --- r: 334715 b: refs/heads/master c:
 92485cef52c2de0f98efdf527ea39cef2b9fc416 h: refs/heads/master i:   334713:
 fe3a783a74cda0c2464fc8952df7f0efacc97e5b   334711:
 c1c001c0997bda9a198e8f9aed05a23bd1cdab2c v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/gpu/drm/nouveau/core/core/gpuobj.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0343fa54071a..512a6c9e3f57 100644
--- 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
index 1f34549aff18..70586fde69cf 100644
--- 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);