diff --git a/drivers/video/tegra/nvmap/nvmap_alloc.c b/drivers/video/tegra/nvmap/nvmap_alloc.c
index 07af7655..e4df8b7c 100644
--- a/drivers/video/tegra/nvmap/nvmap_alloc.c
+++ b/drivers/video/tegra/nvmap/nvmap_alloc.c
@@ -444,7 +444,11 @@ int nvmap_alloc_handle_from_va(struct nvmap_client *client,
 
 	h->userflags = flags;
 	h->flags = (flags & NVMAP_HANDLE_CACHE_FLAG);
-	h->align = PAGE_SIZE;
+	if ((heap_mask & NVMAP_HEAP_CARVEOUT_GPU) != 0)
+		h->align = SIZE_2MB;
+	else
+		h->align = PAGE_SIZE;
+
 	tag = flags >> 16;
 
 	if (!tag && client && !client->tag_warned) {