Merge "cpufreq: schedutil: enable fast switch earlier" into msm-4.9 (5fbb7a2b) · Commits · e / devices / android_kernel_fairphone_FP3

kernel/sched/cpufreq_schedutil.c

+11 −6

Original line number	Diff line number	Diff line
		@@ -416,9 +416,13 @@ static int sugov_init(struct cpufreq_policy *policy)
		if (policy->governor_data)
		return -EBUSY;

		cpufreq_enable_fast_switch(policy);

		sg_policy = sugov_policy_alloc(policy);
		if (!sg_policy)
		return -ENOMEM;
		if (!sg_policy) {
		ret = -ENOMEM;
		goto disable_fast_switch;
		}

		mutex_lock(&global_tunables_lock);

		@@ -456,8 +460,6 @@ static int sugov_init(struct cpufreq_policy *policy)

		out:
		mutex_unlock(&global_tunables_lock);

		cpufreq_enable_fast_switch(policy);
		return 0;

		fail:
		@@ -468,6 +470,10 @@ static int sugov_init(struct cpufreq_policy *policy)
		mutex_unlock(&global_tunables_lock);

		sugov_policy_free(sg_policy);

		disable_fast_switch:
		cpufreq_disable_fast_switch(policy);

		pr_err("initialization failed (error %d)\n", ret);
		return ret;
		}
		@@ -478,8 +484,6 @@ static void sugov_exit(struct cpufreq_policy *policy)
		struct sugov_tunables *tunables = sg_policy->tunables;
		unsigned int count;

		cpufreq_disable_fast_switch(policy);

		mutex_lock(&global_tunables_lock);

		count = gov_attr_set_put(&tunables->attr_set, &sg_policy->tunables_hook);
		@@ -490,6 +494,7 @@ static void sugov_exit(struct cpufreq_policy *policy)
		mutex_unlock(&global_tunables_lock);

		sugov_policy_free(sg_policy);
		cpufreq_disable_fast_switch(policy);
		}

		static int sugov_start(struct cpufreq_policy *policy)