On 20 December 2013 04:20, Jason Baron <jbaron@xxxxxxxxxx> wrote: > When configuring a default governor (via CONFIG_CPU_FREQ_DEFAULT_*) with the > intel_pstate driver, the desired default policy is not properly set. For > example, setting 'CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE' ended up with the > 'powersave' policy being set. > > Fix by configuring the correct default policy, if either 'powersave' or > 'performance' are requested. Otherwise, fallback to what the driver originally > set via its 'init' routine. > > Signed-off-by: Jason Baron <jbaron@xxxxxxxxxx> > --- > > v2: simplify logic > > drivers/cpufreq/cpufreq.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c > index 02d534d..42e1ea4 100644 > --- a/drivers/cpufreq/cpufreq.c > +++ b/drivers/cpufreq/cpufreq.c > @@ -828,6 +828,12 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy) > int ret = 0; > > memcpy(&new_policy, policy, sizeof(*policy)); > + > + /* Use the default policy if its valid. */ > + if (cpufreq_driver->setpolicy) > + cpufreq_parse_governor(policy->governor->name, > + &new_policy.policy, NULL); > + > /* assure that the starting sequence is run in cpufreq_set_policy */ > policy->governor = NULL; Acked-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe cpufreq" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html