From 26287ab7abe72bb0c0f7a1a99faec3e7eb8f7d7c Mon Sep 17 00:00:00 2001 From: Ketan Patil Date: Fri, 23 Aug 2024 11:16:59 +0000 Subject: [PATCH] video: tegra: nvmap: Correct handle alignment For the handle allocated from GPU heap, the alignment should be 2MB, as nvmap allocates huge pages for GPU heap. Make an update for this. Bug 4510173 Change-Id: I94e11fae2452853be2f3e0a430ee474ff88544f4 Signed-off-by: Ketan Patil Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3199230 Reviewed-by: svcacv GVS: buildbot_gerritrpt Reviewed-by: Sachin Nikam --- drivers/video/tegra/nvmap/nvmap_alloc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) {