Evolution-x-devices/device_google_zumapro
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_zumapro synced 2026-02-01 07:42:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "powerstats: merge two callback data providers to single" into 24D1-dev

Browse Source
This commit is contained in:
Treehugger Robot
2024-04-18 07:45:18 +00:00
committed by Android (Google) Code Review
parent 55e9530042 f31af5a3a4
commit 2e8e8d0105
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
powerstats/ZumaProCommonDataProviders.cpp
View File

@@ -636,12 +636,19 @@ void addTPU(std::shared_ptr<PowerStats> p) {
* that live in user space. Entities are defined here and user space clients of this provider's
* vendor service register callbacks to provide state residency data for their given pwoer entity.
*/
void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p) {
void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p, std::string displayName) {
auto pixelSdp = std::make_unique<PixelStateResidencyDataProvider>();
// Bluetooth power stats are provided by BT HAL callback
pixelSdp->addEntity("Bluetooth", {{0, "Idle"}, {1, "Active"}, {2, "Tx"}, {3, "Rx"}});
// Display VRR power stats are provided by HWC callback. If display entity
// name is empty, the device doesn't support VRR power stats.
if (!displayName.empty()) {
pixelSdp->addEntity(displayName, {});
}
pixelSdp->start();
p->addStateResidencyDataProvider(std::move(pixelSdp));
@@ -656,18 +663,10 @@ void addDisplayMrr(std::shared_ptr<PowerStats> p) {
addDisplayMrrByEntity(p, "Display", "/sys/class/drm/card0/device/primary-panel/");
}
void addDisplayVrr(std::shared_ptr<PowerStats> p, std::string name) {
auto provider = std::make_unique<PixelStateResidencyDataProvider>();
provider->addEntity(name, {});
provider->start();
p->addStateResidencyDataProvider(std::move(provider));
}
void addZumaProCommonDataProviders(std::shared_ptr<PowerStats> p) {
setEnergyMeter(p);
addAoC(p);
addPixelStateResidencyDataProvider(p);
addCPUclusters(p);
addSoC(p);
addGNSS(p);

3
powerstats/include/ZumaProCommonDataProviders.h
View File

@@ -25,14 +25,13 @@ void addCPUclusters(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 addDisplayVrr(std::shared_ptr<PowerStats> p, std::string name);
void addDvfsStats(std::shared_ptr<PowerStats> p);
void addGNSS(std::shared_ptr<PowerStats> p);
void addGPU(std::shared_ptr<PowerStats> p);
void addMobileRadio(std::shared_ptr<PowerStats> p);
void addNFC(std::shared_ptr<PowerStats> p);
void addPCIe(std::shared_ptr<PowerStats> p);
void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p);
void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p, std::string displayName);
void addPowerDomains(std::shared_ptr<PowerStats> p);
void addSoC(std::shared_ptr<PowerStats> p);
void addTPU(std::shared_ptr<PowerStats> p);