---

yaml --- r: 307534 b: refs/heads/master c: d37f60c h: refs/heads/master v: v3
git-mirror · May 24, 2012 · ebd3b6e · ebd3b6e
1 parent 6bccf7f
commit ebd3b6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8b6624549342e4b01a5fa8273029d9139439ae4
+refs/heads/master: d37f60c87fbf9dca6724ed42fd55b031f88dd46a
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_instmem.c b/trunk/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -83,7 +83,7 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm,
 		return ret;
 	}
 
-	ret = drm_mm_init(&chan->ramin_heap, 0x6000, chan->ramin->size);
+	ret = drm_mm_init(&chan->ramin_heap, 0x6000, chan->ramin->size - 0x6000);
 	if (ret) {
 		nv50_channel_del(&chan);
 		return ret;