From: Giovanni Gherdovich <ggherdovich@suse.cz>
Date: Mon, 29 Nov 2021 15:45:09 +0100
Subject: Revert "cpufreq: Avoid configuring old governors as default
 with intel_pstate"
Patch-mainline: Never, upstream is promoting schedutil but there is a notable performance regression
References: bsc#1190923

This reverts commit db865272d9c4687520dc29f77e701a1b2669872f ("cpufreq: Avoid
configuring old governors as default with intel_pstate"). That commit makes it
impossible to configure the cpufreq governor "ondemand" as default governor on
x86_64 systems. The intent was to favor the governor "schedutil" when the
driver intel_pstate is used in passive mode; as a side effect, AMD machines
can no longer default to the ondemand governor, which is undesirable.

This patch is a pre-requisite to setting

  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

in the SLES config for x86_64, as it has been for previous SLES releases.

Signed-off-by: Giovanni Gherdovich <ggherdovich@suse.cz>
---
 drivers/cpufreq/Kconfig |    2 --
 1 file changed, 2 deletions(-)

--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -72,7 +72,6 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE
 
 config CPU_FREQ_DEFAULT_GOV_ONDEMAND
 	bool "ondemand"
-	depends on !(X86_INTEL_PSTATE && SMP)
 	select CPU_FREQ_GOV_ONDEMAND
 	select CPU_FREQ_GOV_PERFORMANCE
 	help
@@ -85,7 +84,6 @@ config CPU_FREQ_DEFAULT_GOV_ONDEMAND
 
 config CPU_FREQ_DEFAULT_GOV_CONSERVATIVE
 	bool "conservative"
-	depends on !(X86_INTEL_PSTATE && SMP)
 	select CPU_FREQ_GOV_CONSERVATIVE
 	select CPU_FREQ_GOV_PERFORMANCE
 	help