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

This reverts commit b61876ed12.

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

Bug: 120440300
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: I311c528c9f342035ef9da6a3833004f942daef00
This commit is contained in:
Quentin Perret 2020-01-31 11:26:15 +00:00
commit 1473e2098c

View file

@ -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);