evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: cpufreq: schedutil: enable fast switch earlier

Browse source 
The fast_switch_enabled flag will be used by both sugov_policy_alloc()
and sugov_policy_free() with a later patch.

Prepare for that by moving the calls to enable and disable it to the
beginning of sugov_init() and end of sugov_exit().

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 4a71ce4348bb61740d411822357061f8bf870f4c)
Signed-off-by: Chris Redpath <chris.redpath@arm.com>
Change-Id: Ia174f423ca02d59360657ac2e77a5098ce5cf99c
This commit is contained in:
Chris Redpath 2017-05-25 15:06:27 +01:00 • committed by Andres Oportus
parent bab9c2fbe4
commit ceed1eb2b4
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
kernel/sched/cpufreq_schedutil.c
View file

@ -578,9 +578,13 @@ static int sugov_init(struct cpufreq_policy *policy)
if (policy->governor_data) if (policy->governor_data)
return -EBUSY; return -EBUSY;
cpufreq_enable_fast_switch(policy);
sg_policy = sugov_policy_alloc(policy); sg_policy = sugov_policy_alloc(policy);
if (!sg_policy) if (!sg_policy) {
return -ENOMEM; ret = -ENOMEM;
goto disable_fast_switch;
}
ret = sugov_kthread_create(sg_policy); ret = sugov_kthread_create(sg_policy);
if (ret) if (ret)
@ -625,8 +629,6 @@ static int sugov_init(struct cpufreq_policy *policy)
out: out:
mutex_unlock(&global_tunables_lock); mutex_unlock(&global_tunables_lock);
cpufreq_enable_fast_switch(policy);
return 0; return 0;
fail: fail:
@ -640,6 +642,10 @@ free_sg_policy:
mutex_unlock(&global_tunables_lock); mutex_unlock(&global_tunables_lock);
sugov_policy_free(sg_policy); sugov_policy_free(sg_policy);
disable_fast_switch:
cpufreq_disable_fast_switch(policy);
pr_err("initialization failed (error %d)\n", ret); pr_err("initialization failed (error %d)\n", ret);
return ret; return ret;
} }
@ -650,8 +656,6 @@ static int sugov_exit(struct cpufreq_policy *policy)
struct sugov_tunables *tunables = sg_policy->tunables; struct sugov_tunables *tunables = sg_policy->tunables;
unsigned int count; unsigned int count;
cpufreq_disable_fast_switch(policy);
mutex_lock(&global_tunables_lock); mutex_lock(&global_tunables_lock);
count = gov_attr_set_put(&tunables->attr_set, &sg_policy->tunables_hook); count = gov_attr_set_put(&tunables->attr_set, &sg_policy->tunables_hook);
@ -664,6 +668,7 @@ static int sugov_exit(struct cpufreq_policy *policy)
sugov_kthread_stop(sg_policy); sugov_kthread_stop(sg_policy);
sugov_policy_free(sg_policy); sugov_policy_free(sg_policy);
cpufreq_disable_fast_switch(policy);
return 0; return 0;
} }