diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-14 18:18:07 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-14 18:18:07 +0300 |
| commit | 684952212ca639bce124e673f9f644a09895359c (patch) | |
| tree | d69b9291f10610ad4c71393ed71fabed91f07f70 /include/linux | |
| parent | 4654e9f9f43993eb9ce383fa7c88d14b052b8cc3 (diff) | |
| parent | 11fa52fe619acfa945712d94a0bc27c0f5bc49de (diff) | |
| download | linux-684952212ca639bce124e673f9f644a09895359c.tar.xz | |
Merge back cpufreq changes for 6.4-rc1.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/amd-pstate.h | 2 | ||||
| -rw-r--r-- | include/linux/cpufreq.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h index f5f22418e64b..c10ebf8c42e6 100644 --- a/include/linux/amd-pstate.h +++ b/include/linux/amd-pstate.h @@ -97,6 +97,7 @@ enum amd_pstate_mode { AMD_PSTATE_DISABLE = 0, AMD_PSTATE_PASSIVE, AMD_PSTATE_ACTIVE, + AMD_PSTATE_GUIDED, AMD_PSTATE_MAX, }; @@ -104,6 +105,7 @@ static const char * const amd_pstate_mode_string[] = { [AMD_PSTATE_DISABLE] = "disable", [AMD_PSTATE_PASSIVE] = "passive", [AMD_PSTATE_ACTIVE] = "active", + [AMD_PSTATE_GUIDED] = "guided", NULL, }; #endif /* _LINUX_AMD_PSTATE_H */ diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 65623233ab2f..541013487a0e 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -237,6 +237,7 @@ bool cpufreq_supports_freq_invariance(void); struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy); void cpufreq_enable_fast_switch(struct cpufreq_policy *policy); void cpufreq_disable_fast_switch(struct cpufreq_policy *policy); +bool has_target_index(void); #else static inline unsigned int cpufreq_get(unsigned int cpu) { |