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

Commit 1473e209 authored by Quentin Perret's avatar Quentin Perret
Browse files

Revert "ANDROID: sched/fair: EAS: Add uclamp support to find_energy_efficient_cpu()" 



This reverts commit b61876ed.

There is a better alternative upstream now, so let's drop the android
specific version.

Bug: 120440300
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Change-Id: I311c528c9f342035ef9da6a3833004f942daef00
parent f7eefc38

kernel/sched/fair.c

+0 −17
Original line number Diff line number Diff line
@@ -6035,19 +6035,6 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target) 
	return target;

}



static unsigned int uclamp_task_util(struct task_struct *p)

{

#ifdef CONFIG_UCLAMP_TASK

	unsigned int min_util = uclamp_eff_value(p, UCLAMP_MIN);

	unsigned int max_util = uclamp_eff_value(p, UCLAMP_MAX);

	unsigned int est_util = task_util_est(p);



	return clamp(est_util, min_util, max_util);

#else

	return task_util_est(p);

#endif

}



/**

 * Amount of capacity of a CPU that is (estimated to be) used by CFS tasks

 * @cpu: the CPU to get the utilization of
@@ -6408,10 +6395,6 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu, int sy 
			if (!fits_capacity(util, cpu_cap))

				continue;



			/* Skip CPUs which do not fit task requirements */

			if (cpu_cap < uclamp_task_util(p))

				continue;



			/* Always use prev_cpu as a candidate. */

			if (!latency_sensitive && cpu == prev_cpu) {

				prev_delta = compute_energy(p, prev_cpu, pd);