---

yaml --- r: 228542 b: refs/heads/master c: 3052be2 h: refs/heads/master v: v3
git-mirror · Dec 3, 2010 · b8c93f5 · b8c93f5
1 parent b7eccb7
commit b8c93f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd2e597de8dbd000a3977871f15cb81e2925d63e
+refs/heads/master: 3052be2cea64371300a0338d3ca5d3575fbd109c
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_graph.c b/trunk/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -216,7 +216,7 @@ nv50_graph_create_context(struct nouveau_channel *chan)
 
 	NV_DEBUG(dev, "ch%d\n", chan->id);
 
-	ret = nouveau_gpuobj_new(dev, chan, pgraph->grctx_size, 0x1000,
+	ret = nouveau_gpuobj_new(dev, chan, pgraph->grctx_size, 0,
 				 NVOBJ_FLAG_ZERO_ALLOC |
 				 NVOBJ_FLAG_ZERO_FREE, &chan->ramin_grctx);
 	if (ret)

diff --git a/trunk/drivers/gpu/drm/nouveau/nv84_crypt.c b/trunk/drivers/gpu/drm/nouveau/nv84_crypt.c
@@ -35,7 +35,7 @@ nv84_crypt_create_context(struct nouveau_channel *chan)
 
 	NV_DEBUG(dev, "ch%d\n", chan->id);
 
-	ret = nouveau_gpuobj_new(dev, chan, 256, 0x1000,
+	ret = nouveau_gpuobj_new(dev, chan, 256, 0,
 				 NVOBJ_FLAG_ZERO_ALLOC | NVOBJ_FLAG_ZERO_FREE,
 				 &chan->crypt_ctx);
 	if (ret)