powerstats: update display state residency stats am: 10202aafee am: dfb8f74b46

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/18156632

Change-Id: I0e5b63a87ff2add7831fd5e3f72cccd0c172fc23
Signed-off-by: Automerger Merge Worker <[email protected]>

powerstats/service.cpp

@@ -35,26 +35,22 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
     std::vector<std::string> states = {
         "Off",
-        "LP: 1080x2340@30",
-        "On: 1080x2340@60",
-        "On: 1080x2340@90",
-        "HBM: 1080x2340@60",
-        "HBM: 1080x2340@90"};
+        "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
-    /*
-     * TODO(b/167216667): Add correct display power model here. Must read from display rail
-     * and include proper coefficients for display states.
-     */
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
-            EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display",
-            {{"LP: 1080x2340@30", 1},
-             {"On: 1080x2340@60", 2},
-             {"On: 1080x2340@90", 3}}));
+            EnergyConsumerType::DISPLAY, "display", {"VSYS_PWR_DISPLAY"}, "Display",
+            {{"LP: 1080x2400@30", 1},
+             {"On: 1080x2400@60", 2},
+             {"On: 1080x2400@90", 3}}));
 }
 
 int main() {