summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2014-02-10 14:57:01 +0900
committerBen Skeggs <bskeggs@redhat.com>2014-03-26 13:59:32 +1000
commit02f0b8c895b9bb93e02ba7dcd52a00452f9e7bef (patch)
treecde795f08dec217f6adf8cd06939ebbd6b5ecfa4 /drivers/gpu/drm
parentb6c4285afa66f2f258a237771fd90905a194957d (diff)
downloadop-kernel-dev-02f0b8c895b9bb93e02ba7dcd52a00452f9e7bef.zip
op-kernel-dev-02f0b8c895b9bb93e02ba7dcd52a00452f9e7bef.tar.gz
drm/nve0/fifo: allocate usermem as needed
Memory was always allocated for 4096 channels. Change this to allocate what we actually need according to the number of channels we use. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index 54c1b5b..dbc3ff6 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
@@ -852,8 +852,8 @@ nve0_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
return ret;
}
- ret = nouveau_gpuobj_new(nv_object(priv), NULL, 4096 * 0x200, 0x1000,
- NVOBJ_FLAG_ZERO_ALLOC, &priv->user.mem);
+ ret = nouveau_gpuobj_new(nv_object(priv), NULL, impl->channels * 0x200,
+ 0x1000, NVOBJ_FLAG_ZERO_ALLOC, &priv->user.mem);
if (ret)
return ret;
OpenPOWER on IntegriCloud