Merge "powerstats: expose display MRR state residency data provider" into main
This commit is contained in:
commit
71e9bb2828
2 changed files with 13 additions and 0 deletions
|
@ -19,6 +19,7 @@
|
||||||
#include <AocStateResidencyDataProvider.h>
|
#include <AocStateResidencyDataProvider.h>
|
||||||
#include <CpupmStateResidencyDataProvider.h>
|
#include <CpupmStateResidencyDataProvider.h>
|
||||||
#include <DevfreqStateResidencyDataProvider.h>
|
#include <DevfreqStateResidencyDataProvider.h>
|
||||||
|
#include <DisplayMrrStateResidencyDataProvider.h>
|
||||||
#include <AdaptiveDvfsStateResidencyDataProvider.h>
|
#include <AdaptiveDvfsStateResidencyDataProvider.h>
|
||||||
#include <TpuDvfsStateResidencyDataProvider.h>
|
#include <TpuDvfsStateResidencyDataProvider.h>
|
||||||
#include <UfsStateResidencyDataProvider.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::AocStateResidencyDataProvider;
|
||||||
using aidl::android::hardware::power::stats::CpupmStateResidencyDataProvider;
|
using aidl::android::hardware::power::stats::CpupmStateResidencyDataProvider;
|
||||||
using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider;
|
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::DvfsStateResidencyDataProvider;
|
||||||
using aidl::android::hardware::power::stats::UfsStateResidencyDataProvider;
|
using aidl::android::hardware::power::stats::UfsStateResidencyDataProvider;
|
||||||
using aidl::android::hardware::power::stats::EnergyConsumerType;
|
using aidl::android::hardware::power::stats::EnergyConsumerType;
|
||||||
|
@ -645,6 +647,15 @@ void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p) {
|
||||||
p->addStateResidencyDataProvider(std::move(pixelSdp));
|
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) {
|
void addZumaProCommonDataProviders(std::shared_ptr<PowerStats> p) {
|
||||||
setEnergyMeter(p);
|
setEnergyMeter(p);
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,8 @@ using aidl::android::hardware::power::stats::PowerStats;
|
||||||
void addAoC(std::shared_ptr<PowerStats> p);
|
void addAoC(std::shared_ptr<PowerStats> p);
|
||||||
void addCPUclusters(std::shared_ptr<PowerStats> p);
|
void addCPUclusters(std::shared_ptr<PowerStats> p);
|
||||||
void addDevfreq(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 addDvfsStats(std::shared_ptr<PowerStats> p);
|
||||||
void addGNSS(std::shared_ptr<PowerStats> p);
|
void addGNSS(std::shared_ptr<PowerStats> p);
|
||||||
void addGPU(std::shared_ptr<PowerStats> p);
|
void addGPU(std::shared_ptr<PowerStats> p);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue