diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-02 19:31:28 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-02 19:31:28 +0100 |
commit | bf56b90797c4a03c94b702c50e62296edea9fad9 (patch) | |
tree | 9ae39a4ed28401e23f76dd73a050e44348418eb7 /kernel/power | |
parent | 8e5b4779f6c50d118b3056bbb07c886b9ff8d112 (diff) | |
parent | 6215a5de9e9138fda60f4f1d72f86dd52e4be02b (diff) | |
parent | 3b4bd495131e9832b3b3425a958c03cda6f1d972 (diff) |
Merge branches 'pm-em' and 'powercap'
Merge Energy Model and power capping updates for 5.16-rc1:
- Add support for inefficient operating performance points to the
Energy Model and modify cpufreq to use them properly (Vincent
Donnefort).
- Rearrange the DTPM framework code to simplify it and make it easier
to follow (Daniel Lezcano).
- Fix power intialization in DTPM (Daniel Lezcano).
- Add CPU load consideration when estimating the instaneous power
consumption in DTPM (Daniel Lezcano).
* pm-em:
cpufreq: mediatek-hw: Fix cpufreq_table_find_index_dl() call
PM: EM: Mark inefficiencies in CPUFreq
cpufreq: Use CPUFREQ_RELATION_E in DVFS governors
cpufreq: Introducing CPUFREQ_RELATION_E
cpufreq: Add an interface to mark inefficient frequencies
cpufreq: Make policy min/max hard requirements
PM: EM: Allow skipping inefficient states
PM: EM: Extend em_perf_domain with a flag field
PM: EM: Mark inefficient states
PM: EM: Fix inefficient states detection
* powercap:
powercap/drivers/dtpm: Fix power limit initialization
powercap/drivers/dtpm: Scale the power with the load
powercap/drivers/dtpm: Use container_of instead of a private data field
powercap/drivers/dtpm: Simplify the dtpm table
powercap/drivers/dtpm: Encapsulate even more the code