diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-11-12 15:13:59 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-08 13:48:16 +1000 |
| commit | 5f6fdca570b13a8a2c9cab9ab6edfc17487049cf (patch) | |
| tree | d188de3054be8e2d5d407c3851cf86c9adc967b1 /drivers/gpu/drm | |
| parent | bfd83aca5a1c4cc07fb18d96ed8660f2c338a8f3 (diff) | |
| download | op-kernel-dev-5f6fdca570b13a8a2c9cab9ab6edfc17487049cf.zip op-kernel-dev-5f6fdca570b13a8a2c9cab9ab6edfc17487049cf.tar.gz | |
drm/nv50: enable non-contig vram allocations where requested
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 3a531d5..5a18094 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -713,10 +713,14 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man, struct drm_device *dev = dev_priv->dev; struct nouveau_bo *nvbo = nouveau_bo(bo); struct nouveau_vram *vram; + u32 size_nc = 0; int ret; + if (nvbo->tile_flags & NOUVEAU_GEM_TILE_NONCONTIG) + size_nc = 1 << nvbo->vma.node->type; + ret = nv50_vram_new(dev, mem->num_pages << PAGE_SHIFT, - mem->page_alignment << PAGE_SHIFT, 0, + mem->page_alignment << PAGE_SHIFT, size_nc, (nvbo->tile_flags >> 8) & 0x7f, &vram); if (ret) return ret; |
