From 7eeb1b93ac3e4348bcd3bdb3fc6881fa023b0873 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Fri, 26 Jan 2024 17:32:08 +0800 Subject: [PATCH] powerstats: use display MRR state residency data provider Bug: 322457936 Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest Change-Id: I1a0c7fcaaf832a9c1d8eff3a6a59d98cfc23e28d Signed-off-by: Darren Hsu --- powerstats/service.cpp | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/powerstats/service.cpp b/powerstats/service.cpp index 971fd8f..34e5cbc 100644 --- a/powerstats/service.cpp +++ b/powerstats/service.cpp @@ -36,17 +36,24 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { // Add display residency stats - std::vector states = { - "Off", - "LP: 1080x2400@30", - "On: 1080x2400@60", - "On: 1080x2400@90", - "HBM: 1080x2400@60", - "HBM: 1080x2400@90"}; + 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 states = { + "Off", + "LP: 1080x2400@30", + "On: 1080x2400@60", + "On: 1080x2400@90", + "HBM: 1080x2400@60", + "HBM: 1080x2400@90"}; - p->addStateResidencyDataProvider(std::make_unique("Display", - "/sys/class/backlight/panel0-backlight/state", - states)); + p->addStateResidencyDataProvider(std::make_unique("Display", + "/sys/class/backlight/panel0-backlight/state", + states)); + } // Add display energy consumer p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,