From ab32853a654f24f11d66266f91dd1d3b2915fd50 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Sat, 21 May 2022 03:37:28 +0000 Subject: [PATCH] nvgpu: Get rid of NV_BUILD_KERNEL_OPTIONS for identify stable kernel There are some configs which are set for the stable kernel and it is identified from the NV_BUILD_KERNEL_OPTIONS. The stable kernel build nvgpu as out-of-tree module and pass the environment config CONFIG_TEGRA_OOT_MODULE during build. Hence, it is not required to use the NV_BUILD_KERNEL_OPTIONS to identify the kstable build. It uses CONFIG_TEGRA_OOT_MODULE for setting the configs for build as module. Bug 3652905 Change-Id: I6570760e91ca98a4c83d7691fad517b2c772e629 Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2720729 (cherry picked from commit 646a48ea5a2c25ca9eee237525cd3ca617e38559) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2728409 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.linux.configs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs index bdeae5544..d22f2606c 100644 --- a/drivers/gpu/nvgpu/Makefile.linux.configs +++ b/drivers/gpu/nvgpu/Makefile.linux.configs @@ -122,16 +122,10 @@ CONFIG_NVGPU_NVMEM_FUSE := n CONFIG_NVGPU_NVMAP_NEXT := y CONFIG_NVGPU_NVMEM_FUSE := y -ifneq ($(findstring stable,$(NV_BUILD_KERNEL_OPTIONS)),) -CONFIG_NVGPU_NVMEM_FUSE := y -endif - -# Set CONFIG_NVGPU_IVM_BUILD for non-stable and non-oot build -ifeq ($(findstring stable,$(NV_BUILD_KERNEL_OPTIONS)),) +# Set CONFIG_NVGPU_IVM_BUILD for non-oot build ifneq ($(CONFIG_TEGRA_OOT_MODULE),m) CONFIG_NVGPU_IVM_BUILD := y endif -endif # Set config for OOT module build ifeq ($(CONFIG_TEGRA_OOT_MODULE),m) @@ -194,11 +188,7 @@ endif # internal build system. ifneq ($(NV_BUILD_KERNEL_OPTIONS),) -# Disable the below configs for kstable -ifneq ($(findstring stable,$(NV_BUILD_KERNEL_OPTIONS)),) -CONFIG_GK20A_DEVFREQ := n -CONFIG_GK20A_PM_QOS := n -else ifneq ($(filter 4.9 4.14,$(patsubst -,$(space),$(NV_BUILD_KERNEL_OPTIONS))),) +ifneq ($(filter 4.9 4.14,$(patsubst -,$(space),$(NV_BUILD_KERNEL_OPTIONS))),) # Enable support to pass PM_QOS constraints to devfreq based scaling. CONFIG_GK20A_PM_QOS := y endif