From bfa644d7fa0035c923f97668a03b314ab86c7e95 Mon Sep 17 00:00:00 2001 From: Bitan Biswas Date: Wed, 24 Mar 2021 10:34:05 -0700 Subject: [PATCH] gpu: nvgpu: fix external profile build The config CONFIG_GK20A_PM_QOS is not set for k5.10 and kstable. Adjust the default config selection logic. bug 200705253 Change-Id: I9455af6bfa3d7ef68f2d4551e148ee9c67f001d0 Signed-off-by: Bitan Biswas Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2504877 Reviewed-by: svcacv Reviewed-by: Manish Bhardwaj Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/Makefile.linux.configs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs index 3037addba..05d3934a9 100644 --- a/drivers/gpu/nvgpu/Makefile.linux.configs +++ b/drivers/gpu/nvgpu/Makefile.linux.configs @@ -42,8 +42,8 @@ ifeq ($(CONFIG_PM_DEVFREQ),y) # Select this entry to enable gk20a scaling CONFIG_GK20A_DEVFREQ := y -# Enable support to pass PM_QOS constraints to devfreq based scaling. -CONFIG_GK20A_PM_QOS := y +# Disable support to pass PM_QOS constraints to devfreq based scaling. +CONFIG_GK20A_PM_QOS := n endif endif @@ -135,8 +135,9 @@ ifneq ($(NV_BUILD_KERNEL_OPTIONS),) ifneq ($(findstring stable,$(NV_BUILD_KERNEL_OPTIONS)),) CONFIG_GK20A_DEVFREQ := n CONFIG_GK20A_PM_QOS := n -else ifneq ($(filter 5.10,$(patsubst -,$(space),$(NV_BUILD_KERNEL_OPTIONS))),) -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. +CONFIG_GK20A_PM_QOS := y endif endif