From 6331c7321b15cce1f8a219ecdb5e86c4d6ed1b4a Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Thu, 25 Jan 2024 14:14:58 +0800 Subject: [PATCH] powerstats: use display MRR state residency data provider Bug: 321871758 Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest Change-Id: Idba6d88ce735571c759ff2fb8a0b045ff48a3ff9 Signed-off-by: Darren Hsu --- powerstats/comet/service.cpp | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/powerstats/comet/service.cpp b/powerstats/comet/service.cpp index 21565e2..9b98027 100644 --- a/powerstats/comet/service.cpp +++ b/powerstats/comet/service.cpp @@ -33,35 +33,10 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { // Add display residency stats for inner display - std::vector inner_states = { - "Off", - "LP: 2152x2076@1", - "LP: 2152x2076@30", - "On: 2152x2076@1", - "On: 2152x2076@10", - "On: 2152x2076@60", - "On: 2152x2076@120", - "HBM: 2152x2076@60", - "HBM: 2152x2076@120"}; - - p->addStateResidencyDataProvider(std::make_unique( - "Inner Display", - "/sys/class/backlight/panel0-backlight/state", - inner_states)); + addDisplayMrrByEntity(p, "Inner Display", "/sys/class/drm/card0/device/primary-panel/"); // Add display residency stats for outer display - std::vector outer_states = { - "Off", - "LP: 1080x2424@30", - "On: 1080x2424@60", - "On: 1080x2424@120", - "HBM: 1080x2424@60", - "HBM: 1080x2424@120"}; - - p->addStateResidencyDataProvider(std::make_unique( - "Outer Display", - "/sys/class/backlight/panel1-backlight/state", - outer_states)); + addDisplayMrrByEntity(p, "Outer Display", "/sys/class/drm/card0/device/secondary-panel/"); // Add display energy consumer p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(