From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 12 Nov 2010 05:13:59 +0000 (+1000)
Subject: drm/nv50: enable non-contig vram allocations where requested
X-Git-Tag: v2.6.38-rc1~419^2~37^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5f6fdca570b13a8a2c9cab9ab6edfc17487049cf;p=~shefty%2Frdma-dev.git

drm/nv50: enable non-contig vram allocations where requested

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 3a531d53de4..5a180948038 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;