---

yaml --- r: 276296 b: refs/heads/master c: 1a97b4a h: refs/heads/master v: v3
git-mirror · Nov 30, 2011 · 3169fb8 · 3169fb8
1 parent 49a73ad
commit 3169fb8
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: 26cfa81357b67229f71d25b53cbfbdfb83a38bdf
+refs/heads/master: 1a97b4ace09d7d3fe213a73bc466ca33af98c91c
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_object.c b/trunk/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -680,7 +680,7 @@ nouveau_gpuobj_channel_init_pramin(struct nouveau_channel *chan)
 		return ret;
 	}
 
-	ret = drm_mm_init(&chan->ramin_heap, base, size);
+	ret = drm_mm_init(&chan->ramin_heap, base, size - base);
 	if (ret) {
 		NV_ERROR(dev, "Error creating PRAMIN heap: %d\n", ret);
 		nouveau_gpuobj_ref(NULL, &chan->ramin);