From a76e4d937271a592edb6f117dedb2ddd82642771 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Tue, 23 Jan 2024 17:35:00 +0800
Subject: [PATCH] powerstats: expose display MRR state residency data provider

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

diff --git a/powerstats/ZumaProCommonDataProviders.cpp b/powerstats/ZumaProCommonDataProviders.cpp
index 249a7ab..1f2c9f2 100644
--- a/powerstats/ZumaProCommonDataProviders.cpp
+++ b/powerstats/ZumaProCommonDataProviders.cpp
@@ -19,6 +19,7 @@
 #include <AocStateResidencyDataProvider.h>
 #include <CpupmStateResidencyDataProvider.h>
 #include <DevfreqStateResidencyDataProvider.h>
+#include <DisplayMrrStateResidencyDataProvider.h>
 #include <AdaptiveDvfsStateResidencyDataProvider.h>
 #include <TpuDvfsStateResidencyDataProvider.h>
 #include <UfsStateResidencyDataProvider.h>
@@ -39,6 +40,7 @@ using aidl::android::hardware::power::stats::AdaptiveDvfsStateResidencyDataProvi
 using aidl::android::hardware::power::stats::AocStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::CpupmStateResidencyDataProvider;
 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;
@@ -645,6 +647,15 @@ void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p) {
     p->addStateResidencyDataProvider(std::move(pixelSdp));
 }
 
+void addDisplayMrrByPath(std::shared_ptr<PowerStats> p, std::string path) {
+    p->addStateResidencyDataProvider(std::make_unique<DisplayMrrStateResidencyDataProvider>(
+            "Display", path));
+}
+
+void addDisplayMrr(std::shared_ptr<PowerStats> p) {
+    addDisplayMrrByPath(p, "/sys/class/drm/card0/device/primary-panel/");
+}
+
 void addZumaProCommonDataProviders(std::shared_ptr<PowerStats> p) {
     setEnergyMeter(p);
 
diff --git a/powerstats/include/ZumaProCommonDataProviders.h b/powerstats/include/ZumaProCommonDataProviders.h
index 5c8d8c7..8ef17cf 100644
--- a/powerstats/include/ZumaProCommonDataProviders.h
+++ b/powerstats/include/ZumaProCommonDataProviders.h
@@ -23,6 +23,8 @@ using aidl::android::hardware::power::stats::PowerStats;
 void addAoC(std::shared_ptr<PowerStats> p);
 void addCPUclusters(std::shared_ptr<PowerStats> p);
 void addDevfreq(std::shared_ptr<PowerStats> p);
+void addDisplayMrr(std::shared_ptr<PowerStats> p);
+void addDisplayMrrByPath(std::shared_ptr<PowerStats> p, std::string path);
 void addDvfsStats(std::shared_ptr<PowerStats> p);
 void addGNSS(std::shared_ptr<PowerStats> p);
 void addGPU(std::shared_ptr<PowerStats> p);