From ff196ef65a7a4033b9537af8d0611a4c4ba18f48 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Fri, 26 Jan 2024 16:22:10 +0800
Subject: [PATCH] powerstats: expose display MRR state residency data provider

Bug: 317767775
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: I72037cc9d5b35a47ae0173d52bbc57708a593936
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 powerstats/Gs201CommonDataProviders.cpp       | 11 +++++++++++
 powerstats/include/Gs201CommonDataProviders.h |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp
index d6f1af58..2b1f5618 100644
--- a/powerstats/Gs201CommonDataProviders.cpp
+++ b/powerstats/Gs201CommonDataProviders.cpp
@@ -19,6 +19,7 @@
 #include <AdaptiveDvfsStateResidencyDataProvider.h>
 #include <AocTimedStateResidencyDataProvider.h>
 #include <DevfreqStateResidencyDataProvider.h>
+#include <DisplayMrrStateResidencyDataProvider.h>
 #include <DvfsStateResidencyDataProvider.h>
 #include <UfsStateResidencyDataProvider.h>
 #include <dataproviders/GenericStateResidencyDataProvider.h>
@@ -37,6 +38,7 @@
 using aidl::android::hardware::power::stats::AdaptiveDvfsStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::AocTimedStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider;
+using aidl::android::hardware::power::stats::DisplayMrrStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::DvfsStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::UfsStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::EnergyConsumerType;
@@ -608,6 +610,15 @@ void addCamera(std::shared_ptr<PowerStats> p) {
             {"VSYS_PWR_CAM"}));
 }
 
+void addDisplayMrrByEntity(std::shared_ptr<PowerStats> p, std::string name, std::string path) {
+    p->addStateResidencyDataProvider(std::make_unique<DisplayMrrStateResidencyDataProvider>(
+            name, path));
+}
+
+void addDisplayMrr(std::shared_ptr<PowerStats> p) {
+    addDisplayMrrByEntity(p, "Display", "/sys/class/drm/card0/device/primary-panel/");
+}
+
 void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
     setEnergyMeter(p);
 
diff --git a/powerstats/include/Gs201CommonDataProviders.h b/powerstats/include/Gs201CommonDataProviders.h
index 97a70668..6cc81361 100644
--- a/powerstats/include/Gs201CommonDataProviders.h
+++ b/powerstats/include/Gs201CommonDataProviders.h
@@ -24,6 +24,8 @@ void addAoC(std::shared_ptr<PowerStats> p);
 void addCPUclusters(std::shared_ptr<PowerStats> p);
 void addCamera(std::shared_ptr<PowerStats> p);
 void addDevfreq(std::shared_ptr<PowerStats> p);
+void addDisplayMrr(std::shared_ptr<PowerStats> p);
+void addDisplayMrrByEntity(std::shared_ptr<PowerStats> p, std::string name, std::string path);
 void addDvfsStats(std::shared_ptr<PowerStats> p);
 void addGNSS(std::shared_ptr<PowerStats> p);
 void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p);