aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_object.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-11-25 19:32:22 -0500
committerFrancisco Jerez <currojerez@riseup.net>2010-12-07 21:00:37 -0500
commita0fd9b9f68cd7a5952eae3c5b3c5a3bc0eadfd44 (patch)
tree8ea0e53c082074d1da77777b128814b28f2a9a27 /drivers/gpu/drm/nouveau/nouveau_object.c
parent12fb9525075982bc65cfd71427dd7afdf47bafed (diff)
drm/nouveau: no need to zero dma objects, we fill them completely anyway
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_object.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_object.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
index 3518ebba6fbd..5cc3f7e59fa1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/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,
460 struct drm_device *dev = chan->dev; 460 struct drm_device *dev = chan->dev;
461 int ret; 461 int ret;
462 462
463 ret = nouveau_gpuobj_new(dev, chan, 24, 16, NVOBJ_FLAG_ZERO_ALLOC | 463 ret = nouveau_gpuobj_new(dev, chan, 24, 16, NVOBJ_FLAG_ZERO_FREE, pobj);
464 NVOBJ_FLAG_ZERO_FREE, pobj);
465 if (ret) 464 if (ret)
466 return ret; 465 return ret;
467 466
@@ -536,9 +535,7 @@ nouveau_gpuobj_dma_new(struct nouveau_channel *chan, int class, u64 base,
536 flags0 |= (base & 0x00000fff) << 20; 535 flags0 |= (base & 0x00000fff) << 20;
537 flags2 |= (base & 0xfffff000); 536 flags2 |= (base & 0xfffff000);
538 537
539 ret = nouveau_gpuobj_new(dev, chan, (dev_priv->card_type >= NV_40) ? 538 ret = nouveau_gpuobj_new(dev, chan, 16, 16, NVOBJ_FLAG_ZERO_FREE, &obj);
540 32 : 16, 16, NVOBJ_FLAG_ZERO_ALLOC |
541 NVOBJ_FLAG_ZERO_FREE, &obj);
542 if (ret) 539 if (ret)
543 return ret; 540 return ret;
544 541