diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-01 19:24:02 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-01 19:24:01 -0800 |
| commit | 110e102fe3de3bf08fcdb3f2117530f632c5a99f (patch) | |
| tree | 5b95268a3b64cf856b5373eb2bb8d77f048a2a73 /drivers/thermal | |
| parent | 7fba111f4f8c8191949c50eb7be2fa81ab1ebd98 (diff) | |
| parent | 8b22d5db34cc5d1f06f77458104c405f0f68aecf (diff) | |
Merge "msm: thermal: Apply frequency limit on online CPU to LMH DCVSh"
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/msm_thermal.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/thermal/msm_thermal.c b/drivers/thermal/msm_thermal.c index f685892edd39..82ba412b864e 100644 --- a/drivers/thermal/msm_thermal.c +++ b/drivers/thermal/msm_thermal.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -3554,6 +3554,12 @@ static int __ref msm_thermal_cpu_callback(struct notifier_block *nfb, switch (action & ~CPU_TASKS_FROZEN) { case CPU_UP_PREPARE: + /* + * Apply LMH freq cap vote, which was requested when the + * core was offline. + */ + if (lmh_dcvs_available) + msm_lmh_dcvs_update(cpu); if (!cpumask_test_and_set_cpu(cpu, cpus_previously_online)) pr_debug("Total prev cores online tracked %u\n", cpumask_weight(cpus_previously_online)); |