powerstats: use display MRR state residency data provider

Bug: 322717818
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: I67e9659e37bd34100a6be5d6352f4dc6341d628b
Signed-off-by: Darren Hsu <darrenhsu@google.com>
This commit is contained in:
Darren Hsu 2024-01-29 11:39:54 +08:00
parent c956bde435
commit 04a4c33897

View file

@ -34,17 +34,24 @@ 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
std::vector<std::string> states = { struct stat buffer;
"Off", if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
"LP: 1080x2400@30", // time_in_state exists
"On: 1080x2400@60", addDisplayMrr(p);
"HBM: 1080x2400@60", } else {
}; // time_in_state doesn't exist
std::vector<std::string> states = {
"Off",
"LP: 1080x2400@30",
"On: 1080x2400@60",
"HBM: 1080x2400@60",
};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>( p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Display", "Display",
"/sys/class/backlight/panel0-backlight/state", "/sys/class/backlight/panel0-backlight/state",
states)); states));
}
// Add display energy consumer // Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer( p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(