diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:39:35 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:39:35 +0200 |
| commit | 9c2ff6650f4b7fca7aa6474d3098a972bdc4626e (patch) | |
| tree | d274f7b4b0aa110723d3052e5fb6c916d91c1c4a /kernel | |
| parent | 757e282188f0138a06ebf925c950995feb7bd666 (diff) | |
| parent | b7af6080a3d2d35a410db3eeb162e1ab49c4d27f (diff) | |
| download | linux-9c2ff6650f4b7fca7aa6474d3098a972bdc4626e.tar.bz2 | |
Merge branch 'pm-cpufreq'
* pm-cpufreq: (30 commits)
cpufreq: stats: Fix string format specifier mismatch
arm: disable frequency invariance for CONFIG_BL_SWITCHER
cpufreq,arm,arm64: restructure definitions of arch_set_freq_scale()
cpufreq: stats: Add memory barrier to store_reset()
cpufreq: schedutil: Simplify sugov_fast_switch()
cpufreq: Move traces and update to policy->cur to cpufreq core
cpufreq: stats: Enable stats for fast-switch as well
cpufreq: stats: Mark few conditionals with unlikely()
cpufreq: stats: Remove locking
cpufreq: stats: Defer stats update to cpufreq_stats_record_transition()
arch_topology, arm, arm64: define arch_scale_freq_invariant()
arch_topology, cpufreq: constify arch_* cpumasks
cpufreq: report whether cpufreq supports Frequency Invariance (FI)
cpufreq: move invariance setter calls in cpufreq core
arch_topology: validate input frequencies to arch_set_freq_scale()
cpufreq: qcom: Don't add frequencies without an OPP
cpufreq: qcom-hw: Add cpufreq support for SM8250 SoC
cpufreq: qcom-hw: Use of_device_get_match_data for offsets and row size
cpufreq: qcom-hw: Use devm_platform_ioremap_resource() to simplify code
dt-bindings: cpufreq: cpufreq-qcom-hw: Document Qcom EPSS compatible
...
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/cpufreq_schedutil.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index e39008242cf4..5ae7b4e6e8d6 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -114,22 +114,8 @@ static bool sugov_update_next_freq(struct sugov_policy *sg_policy, u64 time, static void sugov_fast_switch(struct sugov_policy *sg_policy, u64 time, unsigned int next_freq) { - struct cpufreq_policy *policy = sg_policy->policy; - int cpu; - - if (!sugov_update_next_freq(sg_policy, time, next_freq)) - return; - - next_freq = cpufreq_driver_fast_switch(policy, next_freq); - if (!next_freq) - return; - - policy->cur = next_freq; - - if (trace_cpu_frequency_enabled()) { - for_each_cpu(cpu, policy->cpus) - trace_cpu_frequency(next_freq, cpu); - } + if (sugov_update_next_freq(sg_policy, time, next_freq)) + cpufreq_driver_fast_switch(sg_policy->policy, next_freq); } static void sugov_deferred_update(struct sugov_policy *sg_policy, u64 time, |