---

yaml
---
r: 348645
b: refs/heads/master
c: 43f7897
h: refs/heads/master
i:
  348643: 8e9c469
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d19528a9e4f220519c2cb3f56ef0c84ead3ee440
+refs/heads/master: 43f789792e2c7ea2bff37195e4c4b4239e9e02b7

trunk/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c

@@ -145,22 +145,22 @@ 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;
 		}
 
 		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;