Snap for 8632107 from 08b85d048c to tm-qpr1-release

Change-Id: I0e6d66cdfb44d6f5392f74009ad309ee8e8d4615
This commit is contained in:
Android Build Coastguard Worker 2022-05-24 01:03:12 +00:00
commit 55488dfcba
2 changed files with 22 additions and 16 deletions

View file

@ -38,15 +38,18 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats
std::vector<std::string> states = {
"Off",
"LP: 1440x3120@1",
"LP: 1440x3120@10",
"LP: 1440x3120@30",
"On: 1440x3120@10",
"On: 1440x3120@60",
"On: 1440x3120@90",
"On: 1440x3120@120",
"HBM: 1440x3120@60",
"HBM: 1440x3120@90",
"HBM: 1440x3120@120"};
"HBM: 1440x3120@120",
"LP: 1080x2340@30",
"On: 1080x2340@10",
"On: 1080x2340@60",
"On: 1080x2340@120",
"HBM: 1080x2340@60",
"HBM: 1080x2340@120"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Display",
@ -55,16 +58,19 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(
p, EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display",
{{"LP: 1440x3120@1", 1},
{"LP: 1440x3120@10", 2},
{"LP: 1440x3120@30", 3},
{"On: 1440x3120@60", 4},
{"On: 1440x3120@90", 5},
{"On: 1440x3120@120", 6},
{"HBM: 1440x3120@60", 7},
{"HBM: 1440x3120@90", 8},
{"HBM: 1440x3120@120", 9}}));
p, EnergyConsumerType::DISPLAY, "display", {"VSYS_PWR_DISPLAY"}, "Display",
{{"LP: 1440x3120@30", 1},
{"On: 1440x3120@10", 2},
{"On: 1440x3120@60", 3},
{"On: 1440x3120@120", 4},
{"HBM: 1440x3120@60", 5},
{"HBM: 1440x3120@120", 6},
{"LP: 1080x2340@30", 7},
{"On: 1080x2340@10", 8},
{"On: 1080x2340@60", 9},
{"On: 1080x2340@120", 10},
{"HBM: 1080x2340@60", 11},
{"HBM: 1080x2340@120", 12}}));
}
void addUwb(std::shared_ptr<PowerStats> p) {

View file

@ -49,7 +49,7 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(
p, EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display",
p, EnergyConsumerType::DISPLAY, "display", {"VSYS_PWR_DISPLAY"}, "Display",
{{"LP: 1080x2400@30", 1},
{"On: 1080x2400@60", 2},
{"On: 1080x2400@90", 3},