nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 09:12:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvgpu: Get rid of NV_BUILD_KERNEL_OPTIONS for identify stable kernel

Browse Source 
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 <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2720729
(cherry picked from commit 646a48ea5a)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2728409
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Laxman Dewangan
2022-05-21 03:37:28 +00:00
committed by mobile promotions
parent f246facd01
commit ab32853a65
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/nvgpu/Makefile.linux.configs
View File

@@ -122,16 +122,10 @@ CONFIG_NVGPU_NVMEM_FUSE := n
CONFIG_NVGPU_NVMAP_NEXT := y CONFIG_NVGPU_NVMAP_NEXT := y
CONFIG_NVGPU_NVMEM_FUSE := y CONFIG_NVGPU_NVMEM_FUSE := y
ifneq ($(findstring stable,$(NV_BUILD_KERNEL_OPTIONS)),) # Set CONFIG_NVGPU_IVM_BUILD for non-oot build
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)),)
ifneq ($(CONFIG_TEGRA_OOT_MODULE),m) ifneq ($(CONFIG_TEGRA_OOT_MODULE),m)
CONFIG_NVGPU_IVM_BUILD := y CONFIG_NVGPU_IVM_BUILD := y
endif endif
endif
# Set config for OOT module build # Set config for OOT module build
ifeq ($(CONFIG_TEGRA_OOT_MODULE),m) ifeq ($(CONFIG_TEGRA_OOT_MODULE),m)
@@ -194,11 +188,7 @@ endif
# internal build system. # internal build system.
ifneq ($(NV_BUILD_KERNEL_OPTIONS),) ifneq ($(NV_BUILD_KERNEL_OPTIONS),)
# Disable the below configs for kstable ifneq ($(filter 4.9 4.14,$(patsubst -,$(space),$(NV_BUILD_KERNEL_OPTIONS))),)
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))),)
# Enable support to pass PM_QOS constraints to devfreq based scaling. # Enable support to pass PM_QOS constraints to devfreq based scaling.
CONFIG_GK20A_PM_QOS := y CONFIG_GK20A_PM_QOS := y
endif endif