Merge "powerstats: update display state residency and energy consumer" into tm-qpr-dev

This commit is contained in:
TreeHugger Robot 2022-09-16 13:20:30 +00:00 committed by Android (Google) Code Review
commit d2243eb68c

View file

@ -34,36 +34,42 @@ using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider;
using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats // Add display residency stats for inner display
std::vector<std::string> states = { std::vector<std::string> inner_states = {
"Off", "Off",
"LP: 1440x3120@1", "LP: 1840x2208@30",
"LP: 1440x3120@10", "On: 1840x2208@10",
"LP: 1440x3120@30", "On: 1840x2208@60",
"On: 1440x3120@60", "On: 1840x2208@120",
"On: 1440x3120@90", "HBM: 1840x2208@60",
"On: 1440x3120@120", "HBM: 1840x2208@120"};
"HBM: 1440x3120@60",
"HBM: 1440x3120@90",
"HBM: 1440x3120@120"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>( p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Display", "Inner Display",
"/sys/class/backlight/panel0-backlight/state", "/sys/class/backlight/panel0-backlight/state",
states)); inner_states));
// Add display residency stats for outer display
std::vector<std::string> outer_states = {
"Off",
"LP: 1080x2092@30",
"On: 1080x2092@10",
"On: 1080x2092@60",
"On: 1080x2092@120",
"HBM: 1080x2092@60",
"HBM: 1080x2092@120"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Outer Display",
"/sys/class/backlight/panel1-backlight/state",
outer_states));
// Add display energy consumer // Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer( p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
p, EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", p,
{{"LP: 1440x3120@1", 1}, EnergyConsumerType::DISPLAY,
{"LP: 1440x3120@10", 2}, "Display",
{"LP: 1440x3120@30", 3}, {"VSYS_PWR_DISPLAY"}));// VSYS_PWR_DISPLAY = inner + outer
{"On: 1440x3120@60", 4},
{"On: 1440x3120@90", 5},
{"On: 1440x3120@120", 6},
{"HBM: 1440x3120@60", 7},
{"HBM: 1440x3120@90", 8},
{"HBM: 1440x3120@120", 9}}));
} }
void addUwb(std::shared_ptr<PowerStats> p) { void addUwb(std::shared_ptr<PowerStats> p) {