From 7eeb1b93ac3e4348bcd3bdb3fc6881fa023b0873 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Fri, 26 Jan 2024 17:32:08 +0800 Subject: [PATCH 1/3] 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, From 30958d3af4d6102c87c1f89c65cf34cb111b3e1d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 10 Jan 2024 05:52:28 +0000 Subject: [PATCH 2/3] Update lynx SVN to 32 Bug: 313797924 Change-Id: Ica046accfb62104cf755106fa60d25ec0aeb0578 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index bfe93e4..5edf46b 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f68880e55d8092e78f9f6e3c79b1d21dbe156725 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 26 Jan 2024 22:38:40 +0000 Subject: [PATCH 3/3] Update lynx SVN to 33 Bug: 313797924 Change-Id: Ibe942f1fd0a3996d94921b383bf1f1be0720b813 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 5edf46b..9019fc3 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=33 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \