From 31c6ad4b01ee4a76341deeda4c50f0e3e8ca8e60 Mon Sep 17 00:00:00 2001 From: Yash Bhatt Date: Tue, 26 Mar 2024 15:51:24 +0000 Subject: [PATCH] video: tegra: nvmap: Protect vidmem_carveout code Function nvmap_register_vidmem_carveout currently has no callers so protect it under NVMAP_HEAP_CARVEOUT_VIDMEM macro, so that if needed by an api in future it can be re-used. Bug 4479027 Change-Id: I0acd67d22f5ea2f1d31926bdd1f0ecffd0dd336e Signed-off-by: Yash Bhatt Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3104689 GVS: Gerrit_Virtual_Submit Reviewed-by: Ketan Patil Reviewed-by: Sachin Nikam --- drivers/video/tegra/nvmap/Makefile.memory.configs | 3 +++ drivers/video/tegra/nvmap/nvmap_init.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/drivers/video/tegra/nvmap/Makefile.memory.configs b/drivers/video/tegra/nvmap/Makefile.memory.configs index 3c092d37..30e3ced0 100644 --- a/drivers/video/tegra/nvmap/Makefile.memory.configs +++ b/drivers/video/tegra/nvmap/Makefile.memory.configs @@ -113,6 +113,9 @@ NVMAP_CONFIG_CACHE_FLUSH_AT_ALLOC := y # Config for enabling the dma-buf deferred unmapping NVMAP_CONFIG_DMABUF_DEFERRED_UNMAPPING := n + +#Config for enabling nvmap_register_vidmem_carveout +NVMAP_CONFIG_VIDMEM_CARVEOUT := n ################################################################################ # Section 3 # Enable/Disable configs based upon the kernel version diff --git a/drivers/video/tegra/nvmap/nvmap_init.c b/drivers/video/tegra/nvmap/nvmap_init.c index ce82286a..cf208024 100644 --- a/drivers/video/tegra/nvmap/nvmap_init.c +++ b/drivers/video/tegra/nvmap/nvmap_init.c @@ -181,6 +181,7 @@ found: return NULL; } +#ifdef NVMAP_CONFIG_VIDMEM_CARVEOUT int nvmap_register_vidmem_carveout(struct device *dma_dev, phys_addr_t base, size_t size) { @@ -204,6 +205,7 @@ int nvmap_register_vidmem_carveout(struct device *dma_dev, return nvmap_create_carveout(vidmem_co); } EXPORT_SYMBOL(nvmap_register_vidmem_carveout); +#endif /* NVMAP_CONFIG_VIDMEM_CARVEOUT */ #ifdef CONFIG_TEGRA_VIRTUALIZATION static int __init nvmap_populate_ivm_carveout(struct device *dev)