commit 094fc3778d6b9c795d8075cf20171fe70ace5af2
author Greg Kroah-Hartman <gregkh@google.com> Fri Mar 14 14:46:10 2025 +0000
committer Greg Kroah-Hartman <gregkh@google.com> Fri Mar 14 14:46:10 2025 +0000
tree 808ff595dbd40d94b3df8aad4237f2c51e928cc6
parent fc9aa81462ee32fea3dd6d7c6d8d7dcdb69637df
parent 9d091e874b660fb70feb5e69ac34c66fcda4eea5

Merge 9d091e874b66 ("cpufreq: schedutil: Simplify sugov_update_next_freq()") into android13-5.10-lts

Steps on the way to 5.10.235

Resolves merge conflicts with:
	kernel/sched/cpufreq_schedutil.c

Change-Id: Iabaa7bb6bbfefe1b40f0fa30406d55e29ddfb4d5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

kernel/sched/cpufreq_schedutil.c

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index 36eab7c..2e90802 100644
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -103,14 +103,14 @@ static bool sugov_should_update_freq(struct sugov_policy *sg_policy, u64 time)
 static bool sugov_update_next_freq(struct sugov_policy *sg_policy, u64 time,
 				   unsigned int next_freq)
 {
-	if (!sg_policy->need_freq_update) {
+	if (sg_policy->need_freq_update)
+		sg_policy->need_freq_update = cpufreq_driver_test_flags(CPUFREQ_NEED_UPDATE_LIMITS);
+	else {
 		s64 delta_ns = time - sg_policy->last_freq_update_time;
 		trace_android_vh_update_next_freq(sg_policy->policy, sg_policy->next_freq,
 				&next_freq, delta_ns);
 		if (sg_policy->next_freq == next_freq)
 			return false;
-	} else {
-		sg_policy->need_freq_update = cpufreq_driver_test_flags(CPUFREQ_NEED_UPDATE_LIMITS);
 	}
 
 	sg_policy->next_freq = next_freq;