From 7b321b4891546ea5b9e95d4be5ba45c8388ec95b Mon Sep 17 00:00:00 2001
From: Aleksi Torhamo <aleksi@torhamo.net>
Date: Wed, 9 Jan 2013 20:08:48 +0200
Subject: [PATCH] --- yaml --- r: 348645 b: refs/heads/master c:
 43f789792e2c7ea2bff37195e4c4b4239e9e02b7 h: refs/heads/master i:   348643:
 8e9c469e3f7463555ce7f6579e31658b4a526720 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 21ab5cc54081..8cf845a0ac39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d19528a9e4f220519c2cb3f56ef0c84ead3ee440
+refs/heads/master: 43f789792e2c7ea2bff37195e4c4b4239e9e02b7
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c
index 306bdf121452..7606ed15b6fa 100644
--- a/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c
+++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c
@@ -145,14 +145,14 @@ nvc0_fb_vram_new(struct nouveau_fb *pfb, u64 size, u32 align, u32 ncmin,
 	mem->memtype = type;
 	mem->size = size;
 
-	mutex_lock(&mm->mutex);
+	mutex_lock(&pfb->base.mutex);
 	do {
 		if (back)
 			ret = nouveau_mm_tail(mm, 1, size, ncmin, align, &r);
 		else
 			ret = nouveau_mm_head(mm, 1, size, ncmin, align, &r);
 		if (ret) {
-			mutex_unlock(&mm->mutex);
+			mutex_unlock(&pfb->base.mutex);
 			pfb->ram.put(pfb, &mem);
 			return ret;
 		}
@@ -160,7 +160,7 @@ nvc0_fb_vram_new(struct nouveau_fb *pfb, u64 size, u32 align, u32 ncmin,
 		list_add_tail(&r->rl_entry, &mem->regions);
 		size -= r->length;
 	} while (size);
-	mutex_unlock(&mm->mutex);
+	mutex_unlock(&pfb->base.mutex);
 
 	r = list_first_entry(&mem->regions, struct nouveau_mm_node, rl_entry);
 	mem->offset = (u64)r->offset << 12;