From bc01b6ec0244502364177d00bc6320d09668d9b8 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Wed, 20 Dec 2023 20:14:56 +0800
Subject: [PATCH] powerstats: expose display MRR state residency data provider

Bug: 317192192
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: I1e02ffa0dfcfe61e7c2fa0acb44241b322046b0a
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 powerstats/ZumaCommonDataProviders.cpp       | 7 +++++++
 powerstats/include/ZumaCommonDataProviders.h | 1 +
 2 files changed, 8 insertions(+)

diff --git a/powerstats/ZumaCommonDataProviders.cpp b/powerstats/ZumaCommonDataProviders.cpp
index dc3f5342..2602a85f 100644
--- a/powerstats/ZumaCommonDataProviders.cpp
+++ b/powerstats/ZumaCommonDataProviders.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;
@@ -648,6 +650,11 @@ void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p) {
     p->addStateResidencyDataProvider(std::move(pixelSdp));
 }
 
+void addDisplayMRR(std::shared_ptr<PowerStats> p) {
+    p->addStateResidencyDataProvider(std::make_unique<DisplayMrrStateResidencyDataProvider>(
+            "Display", "/sys/class/backlight/panel0-backlight/"));
+}
+
 void addZumaCommonDataProviders(std::shared_ptr<PowerStats> p) {
     setEnergyMeter(p);
 
diff --git a/powerstats/include/ZumaCommonDataProviders.h b/powerstats/include/ZumaCommonDataProviders.h
index 03976e75..5ca5481b 100644
--- a/powerstats/include/ZumaCommonDataProviders.h
+++ b/powerstats/include/ZumaCommonDataProviders.h
@@ -23,6 +23,7 @@ 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 addDvfsStats(std::shared_ptr<PowerStats> p);
 void addGNSS(std::shared_ptr<PowerStats> p);
 void addGPU(std::shared_ptr<PowerStats> p);