summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-03-28 00:04:30 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-03-28 23:12:07 +0200
commit6404367862bb25730e373cb9d443757b76f6abcc (patch)
treed44c03b0a94eedc2ed32fdcf7d3a7c1b32fa3d1f /drivers
parente14cf8857ebd7486a4e30fa7dad06ba187e6cb04 (diff)
downloadlinux-stable-6404367862bb25730e373cb9d443757b76f6abcc.tar.gz
linux-stable-6404367862bb25730e373cb9d443757b76f6abcc.tar.bz2
linux-stable-6404367862bb25730e373cb9d443757b76f6abcc.zip
cpufreq: intel_pstate: Drop pointless initialization of PID parameters
The P-state selection algorithm used by intel_pstate for Atom processors is not based on the PID controller and the initialization of PID parametrs for those processors is pointless and confusing, so drop it. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/intel_pstate.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index a7ed42d6f366..efce4e7eeeca 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1540,14 +1540,6 @@ static struct cpu_defaults core_params = {
};
static const struct cpu_defaults silvermont_params = {
- .pid_policy = {
- .sample_rate_ms = 10,
- .deadband = 0,
- .setpoint = 60,
- .p_gain_pct = 14,
- .d_gain_pct = 0,
- .i_gain_pct = 4,
- },
.funcs = {
.get_max = atom_get_max_pstate,
.get_max_physical = atom_get_max_pstate,
@@ -1561,14 +1553,6 @@ static const struct cpu_defaults silvermont_params = {
};
static const struct cpu_defaults airmont_params = {
- .pid_policy = {
- .sample_rate_ms = 10,
- .deadband = 0,
- .setpoint = 60,
- .p_gain_pct = 14,
- .d_gain_pct = 0,
- .i_gain_pct = 4,
- },
.funcs = {
.get_max = atom_get_max_pstate,
.get_max_physical = atom_get_max_pstate,
@@ -1602,14 +1586,6 @@ static const struct cpu_defaults knl_params = {
};
static const struct cpu_defaults bxt_params = {
- .pid_policy = {
- .sample_rate_ms = 10,
- .deadband = 0,
- .setpoint = 60,
- .p_gain_pct = 14,
- .d_gain_pct = 0,
- .i_gain_pct = 4,
- },
.funcs = {
.get_max = core_get_max_pstate,
.get_max_physical = core_get_max_pstate_physical,
@@ -2637,9 +2613,9 @@ static int __init intel_pstate_init(void)
return -ENODEV;
cpu_def = (struct cpu_defaults *)id->driver_data;
-
- copy_pid_params(&cpu_def->pid_policy);
copy_cpu_funcs(&cpu_def->funcs);
+ if (pstate_funcs.get_target_pstate == get_target_pstate_use_performance)
+ copy_pid_params(&cpu_def->pid_policy);
}
if (intel_pstate_msrs_not_valid())