diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-07-01 14:35:28 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-07-01 14:35:28 +0800 |
commit | f8749d04e26aa003ad75cb2ab371bc562eb56231 (patch) | |
tree | 4aa16a1a9d5043e4d22f8cabe98dcf3bfa93e6fc /drivers/cpufreq/intel_pstate.c | |
parent | ff6d469851b0e93dacbca9b56f9d1b903180a3fd (diff) | |
parent | 439863d92fda525a8f3b326a24490e91c70f0496 (diff) |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.06-android
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
-rw-r--r-- | drivers/cpufreq/intel_pstate.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 1ee2ab58e37d..e6eed20b1401 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -1037,8 +1037,11 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy) /* cpuinfo and default policy values */ policy->cpuinfo.min_freq = cpu->pstate.min_pstate * cpu->pstate.scaling; - policy->cpuinfo.max_freq = - cpu->pstate.turbo_pstate * cpu->pstate.scaling; + update_turbo_state(); + policy->cpuinfo.max_freq = limits.turbo_disabled ? + cpu->pstate.max_pstate : cpu->pstate.turbo_pstate; + policy->cpuinfo.max_freq *= cpu->pstate.scaling; + policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; cpumask_set_cpu(policy->cpu, policy->cpus); |