From ebd3b6eb27902d00dd69baf2dff4d1de7f56b65c Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Sun, 15 Apr 2012 14:36:07 +0200
Subject: [PATCH] --- yaml --- r: 307534 b: refs/heads/master c:
 d37f60c87fbf9dca6724ed42fd55b031f88dd46a h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/nouveau/nv50_instmem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3c89d22571ee..d83e5722617e 100644
--- 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
index a7c12c94a5a6..0bba54f11800 100644
--- 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;