From 96292d688b21ecbbca801e72864fcbda16c55cf6 Mon Sep 17 00:00:00 2001 From: Sagar Kamble Date: Fri, 1 Jul 2022 16:31:45 +0530 Subject: [PATCH] gpu: nvgpu: update Makefile for NVMAP_NEXT and TEGRA_NVLINK configs To build nvgpu as external module NV_BUILD_KERNEL_OPTIONS dependency is present to set the config CONFIG_NVGPU_NVMAP_NEXT. Remove that dependency as rel-35 does not support kernels prior to v5.10. And nvlink symbols are not found while building with public sources. nvlink is not supported on rel-35, hence disable that config. Bug 3700823 Bug 3684625 Change-Id: I8787ecb9746dd010a025e6d53679d2f23578ad56 Signed-off-by: Sagar Kamble Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2738479 Tested-by: Debarshi Dutta Reviewed-by: Debarshi Dutta Reviewed-by: Bibek Basu GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/Makefile.linux.configs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs index 940a164f6..7be955f4c 100644 --- a/drivers/gpu/nvgpu/Makefile.linux.configs +++ b/drivers/gpu/nvgpu/Makefile.linux.configs @@ -114,10 +114,8 @@ endif CONFIG_NVGPU_NVMEM_FUSE := n -ifneq ($(findstring 5.10,$(NV_BUILD_KERNEL_OPTIONS)),) CONFIG_NVGPU_NVMAP_NEXT := y CONFIG_NVGPU_NVMEM_FUSE := y -endif ifneq ($(findstring stable,$(NV_BUILD_KERNEL_OPTIONS)),) CONFIG_NVGPU_NVMEM_FUSE := y @@ -154,6 +152,8 @@ ifeq ($(CONFIG_NV_TEGRA_MC),y) CONFIG_NVGPU_USE_TEGRA_ALLOC_FD := y endif +CONFIG_TEGRA_NVLINK := n + # Support Nvlink ifeq ($(CONFIG_TEGRA_NVLINK),y) CONFIG_NVGPU_NVLINK := y