Merge tag 'drm-fixes-5.3-2019-07-31' of git://people.freedesktop.org/~agd5f/linux...

[linux.git] / drivers / cpufreq / intel_pstate.c

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index f2ff5de988c1abbd9bd92670382abc6612b0154c..cc27d4c59dca8324b6b0a28c688e7e3793d026cb 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -898,7 +898,6 @@ static void intel_pstate_update_policies(void)
 static void intel_pstate_update_max_freq(unsigned int cpu)
 {
        struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu);
-       struct cpufreq_policy new_policy;
        struct cpudata *cpudata;
 
        if (!policy)
@@ -908,11 +907,7 @@ static void intel_pstate_update_max_freq(unsigned int cpu)
        policy->cpuinfo.max_freq = global.turbo_disabled_mf ?
                        cpudata->pstate.max_freq : cpudata->pstate.turbo_freq;
 
-       memcpy(&new_policy, policy, sizeof(*policy));
-       new_policy.max = min(policy->user_policy.max, policy->cpuinfo.max_freq);
-       new_policy.min = min(policy->user_policy.min, new_policy.max);
-
-       cpufreq_set_policy(policy, &new_policy);
+       refresh_frequency_limits(policy);
 
        cpufreq_cpu_release(policy);
 }