diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-10-15 09:15:26 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 15:06:51 +1000 |
| commit | 9100468d1be26063aa25ecd667ea922c101d203f (patch) | |
| tree | 666e642afa5d21fa135546ced3c79a7d9985f87c /drivers/gpu/drm/nouveau/nv50_instmem.c | |
| parent | 0541324abce0225a795222558fdfe35c8dbc5b4f (diff) | |
| download | kernel_samsung_smdk4412-9100468d1be26063aa25ecd667ea922c101d203f.zip kernel_samsung_smdk4412-9100468d1be26063aa25ecd667ea922c101d203f.tar.gz kernel_samsung_smdk4412-9100468d1be26063aa25ecd667ea922c101d203f.tar.bz2 | |
drm/nouveau: pass gpuobj alignment request down into backing allocator
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_instmem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_instmem.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index 0651e76..2c98eb1 100644 --- a/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c @@ -322,19 +322,19 @@ nv50_instmem_resume(struct drm_device *dev) int nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, - uint32_t *sz) + u32 *size, u32 align) { int ret; if (gpuobj->im_backing) return -EINVAL; - *sz = ALIGN(*sz, 4096); - if (*sz == 0) + *size = ALIGN(*size, 4096); + if (*size == 0) return -EINVAL; - ret = nouveau_bo_new(dev, NULL, *sz, 0, TTM_PL_FLAG_VRAM, 0, 0x0000, - true, false, &gpuobj->im_backing); + ret = nouveau_bo_new(dev, NULL, *size, align, TTM_PL_FLAG_VRAM, + 0, 0x0000, true, false, &gpuobj->im_backing); if (ret) { NV_ERROR(dev, "error getting PRAMIN backing pages: %d\n", ret); return ret; |