commit 9f8d68108898e598a6b498b3c5e11f68215e06cb
author Darren Hsu <darrenhsu@google.com> Mon Jan 29 11:26:08 2024 +0800
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jan 29 06:23:49 2024 +0000
tree b678c10db2f2f5c930171cd97bbacf74b2247a66
parent 34f3ee5073cbe8d99533120e71e285e71c633b3d

powerstats: expose display MRR state residency data provider

Bug: 321848496
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: I967210bef1d33d8bc344ea80e6c31f70a3414604
Signed-off-by: Darren Hsu <darrenhsu@google.com>

powerstats/Gs101CommonDataProviders.cpp

diff --git a/powerstats/Gs101CommonDataProviders.cpp b/powerstats/Gs101CommonDataProviders.cpp
index 035810b..615bb16 100644
--- a/powerstats/Gs101CommonDataProviders.cpp
+++ b/powerstats/Gs101CommonDataProviders.cpp
@@ -18,6 +18,7 @@
 #include <Gs101CommonDataProviders.h>
 #include "AocStateResidencyDataProvider.h"
 #include "DevfreqStateResidencyDataProvider.h"
+#include <DisplayMrrStateResidencyDataProvider.h>
 #include "DvfsStateResidencyDataProvider.h"
 #include "UfsStateResidencyDataProvider.h"
 #include <dataproviders/GenericStateResidencyDataProvider.h>
@@ -34,6 +35,7 @@
 
 using aidl::android::hardware::power::stats::AocStateResidencyDataProvider;
 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;
@@ -669,6 +671,11 @@
     p->addStateResidencyDataProvider(std::move(pixelSdp));
 }
 
+void addDisplayMrr(std::shared_ptr<PowerStats> p) {
+    p->addStateResidencyDataProvider(std::make_unique<DisplayMrrStateResidencyDataProvider>(
+            "Display", "/sys/class/drm/card0/device/primary-panel/"));
+}
+
 void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p) {
     setEnergyMeter(p);
 

powerstats/include/Gs101CommonDataProviders.h

diff --git a/powerstats/include/Gs101CommonDataProviders.h b/powerstats/include/Gs101CommonDataProviders.h
index 98e6953..469d514 100644
--- a/powerstats/include/Gs101CommonDataProviders.h
+++ b/powerstats/include/Gs101CommonDataProviders.h
@@ -22,4 +22,5 @@
 
 void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p);
 
+void addDisplayMrr(std::shared_ptr<PowerStats> p);
 void addNFC(std::shared_ptr<PowerStats> p, const std::string& path);