---

yaml --- r: 228592 b: refs/heads/master c: a0fd9b9 h: refs/heads/master v: v3
git-mirror · Dec 8, 2010 · 11421f8 · 11421f8
1 parent e6d69ef
commit 11421f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12fb9525075982bc65cfd71427dd7afdf47bafed
+refs/heads/master: a0fd9b9f68cd7a5952eae3c5b3c5a3bc0eadfd44
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_object.c b/trunk/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -460,8 +460,7 @@ nv50_gpuobj_dma_new(struct nouveau_channel *chan, int class, u64 base, u64 size,
 	struct drm_device *dev = chan->dev;
 	int ret;
 
-	ret = nouveau_gpuobj_new(dev, chan, 24, 16, NVOBJ_FLAG_ZERO_ALLOC |
-				 NVOBJ_FLAG_ZERO_FREE, pobj);
+	ret = nouveau_gpuobj_new(dev, chan, 24, 16, NVOBJ_FLAG_ZERO_FREE, pobj);
 	if (ret)
 		return ret;
 
@@ -536,9 +535,7 @@ nouveau_gpuobj_dma_new(struct nouveau_channel *chan, int class, u64 base,
 	flags0 |= (base & 0x00000fff) << 20;
 	flags2 |= (base & 0xfffff000);
 
-	ret = nouveau_gpuobj_new(dev, chan, (dev_priv->card_type >= NV_40) ?
-				 32 : 16, 16, NVOBJ_FLAG_ZERO_ALLOC |
-				 NVOBJ_FLAG_ZERO_FREE, &obj);
+	ret = nouveau_gpuobj_new(dev, chan, 16, 16, NVOBJ_FLAG_ZERO_FREE, &obj);
 	if (ret)
 		return ret;