Jelajahi Sumber

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 <[email protected]>
Darren Hsu 1 tahun lalu
induk
melakukan
7eeb1b93ac
1 mengubah file dengan 18 tambahan dan 11 penghapusan
  1. 18 11
      powerstats/service.cpp

+ 18 - 11
powerstats/service.cpp

@@ -36,17 +36,24 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 
 void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
-    std::vector<std::string> states = {
-        "Off",
-        "LP: 1080x2400@30",
-        "On: 1080x2400@60",
-        "On: 1080x2400@90",
-        "HBM: 1080x2400@60",
-        "HBM: 1080x2400@90"};
-
-    p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
-            "/sys/class/backlight/panel0-backlight/state",
-            states));
+    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: 1080x2400@30",
+            "On: 1080x2400@60",
+            "On: 1080x2400@90",
+            "HBM: 1080x2400@60",
+            "HBM: 1080x2400@90"};
+
+        p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
+                "/sys/class/backlight/panel0-backlight/state",
+                states));
+    }
 
     // Add display energy consumer
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,