powerstats: use display VRR power stats on specific devices

Bug: 329201432
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I77d49f87929a7e534576f3a6d77fc820172f7f93
Signed-off-by: Darren Hsu <darrenhsu@google.com>
This commit is contained in:
Darren Hsu 2024-03-13 11:54:43 +08:00
parent 80882c611b
commit a6b5f7acc4
2 changed files with 2 additions and 64 deletions

View file

@ -33,38 +33,6 @@ using aidl::android::hardware::power::stats::EnergyConsumerType;
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
struct stat buffer;
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state exists
addDisplayMrr(p);
} else {
// time_in_state doesn't exist
std::vector<std::string> states = {
"Off",
"LP: 960x2142@1",
"LP: 960x2142@30",
"On: 960x2142@1",
"On: 960x2142@30",
"On: 960x2142@60",
"On: 960x2142@120",
"HBM: 960x2142@60",
"HBM: 960x2142@120",
"LP: 1280x2856@1",
"LP: 1280x2856@30",
"On: 1280x2856@1",
"On: 1280x2856@30",
"On: 1280x2856@60",
"On: 1280x2856@120",
"HBM: 1280x2856@60",
"HBM: 1280x2856@120"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Display",
"/sys/class/backlight/panel0-backlight/state",
states));
}
// Add display energy consumer // Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
p, p,
@ -81,6 +49,7 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>(); std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addDisplayVrr(p, "Display");
addZumaProCommonDataProviders(p); addZumaProCommonDataProviders(p);
addDisplay(p); addDisplay(p);

View file

@ -33,38 +33,6 @@ using aidl::android::hardware::power::stats::EnergyConsumerType;
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
struct stat buffer;
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state exists
addDisplayMrr(p);
} else {
// time_in_state doesn't exist
std::vector<std::string> states = {
"Off",
"LP: 1008x2244@1",
"LP: 1008x2244@30",
"On: 1008x2244@1",
"On: 1008x2244@30",
"On: 1008x2244@60",
"On: 1008x2244@120",
"HBM: 1008x2244@60",
"HBM: 1008x2244@120",
"LP: 1344x2992@1",
"LP: 1344x2992@30",
"On: 1344x2992@1",
"On: 1344x2992@30",
"On: 1344x2992@60",
"On: 1344x2992@120",
"HBM: 1344x2992@60",
"HBM: 1344x2992@120"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Display",
"/sys/class/backlight/panel0-backlight/state",
states));
}
// Add display energy consumer // Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
p, p,
@ -81,6 +49,7 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>(); std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addDisplayVrr(p, "Display");
addZumaProCommonDataProviders(p); addZumaProCommonDataProviders(p);
addDisplay(p); addDisplay(p);