diff --git a/[refs] b/[refs]
index 5fe8f1314985..469fc8a7eed9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfd83aca5a1c4cc07fb18d96ed8660f2c338a8f3
+refs/heads/master: 5f6fdca570b13a8a2c9cab9ab6edfc17487049cf
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c b/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c
index 3a531d53de4d..5a1809480388 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/trunk/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;