Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dd0241e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpufreq: schedutil: Pass sg_policy to get_next_freq()" into msm-4.9

parents a0785932 e74f7f10

kernel/sched/cpufreq_schedutil.c

+5 −6
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void sugov_update_commit(struct sugov_policy *sg_policy, u64 time, 


/**

 * get_next_freq - Compute a new frequency for a given cpufreq policy.

 * @sg_cpu: schedutil cpu object to compute the new frequency for.

 * @sg_policy: schedutil policy object to compute the new frequency for.

 * @util: Current CPU utilization.

 * @max: CPU capacity.

 *
@@ -135,10 +135,9 @@ static void sugov_update_commit(struct sugov_policy *sg_policy, u64 time, 
 * next_freq (as calculated above) is returned, subject to policy min/max and

 * cpufreq driver limitations.

 */

static unsigned int get_next_freq(struct sugov_cpu *sg_cpu, unsigned long util,

				  unsigned long max)

static unsigned int get_next_freq(struct sugov_policy *sg_policy,

				  unsigned long util, unsigned long max)

{

	struct sugov_policy *sg_policy = sg_cpu->sg_policy;

	struct cpufreq_policy *policy = sg_policy->policy;

	unsigned int freq = arch_scale_freq_invariant() ?

				policy->cpuinfo.max_freq : policy->cur;
@@ -212,7 +211,7 @@ static void sugov_update_single(struct update_util_data *hook, u64 time, 
	} else {

		sugov_get_util(&util, &max);

		sugov_iowait_boost(sg_cpu, &util, &max);

		next_f = get_next_freq(sg_cpu, util, max);

		next_f = get_next_freq(sg_policy, util, max);

	}

	sugov_update_commit(sg_policy, time, next_f);

}
@@ -266,7 +265,7 @@ static unsigned int sugov_next_freq_shared(struct sugov_cpu *sg_cpu, 
		sugov_iowait_boost(j_sg_cpu, &util, &max);

	}



	return get_next_freq(sg_cpu, util, max);

	return get_next_freq(sg_policy, util, max);

}



static void sugov_update_shared(struct update_util_data *hook, u64 time,