Evolution-X-Tensor/device_google_comet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate comet to P24 zumapro codebase

Browse source 
Bug: 287173316
Change-Id: Id03e526ff8ca67d8d9ee83a9d3bacfb1473e9a25
This commit is contained in:
Robin Peng 2023-06-14 15:29:33 +00:00
parent a6b4f6f575
commit e5d2a88616
9 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
powerstats/comet/Android.bp
View file

@ -15,7 +15,7 @@
soong_namespace {
imports: [
"hardware/google/pixel",
"device/google/zuma/powerstats",
"device/google/zumapro/powerstats",
]
}
@ -37,6 +37,6 @@ cc_binary {
],
shared_libs: [
"android.hardware.power.stats-impl.zuma",
"android.hardware.power.stats-impl.zumapro",
],
}

26
powerstats/comet/service.cpp
View file

@ -18,7 +18,7 @@
#include <dataproviders/DisplayStateResidencyDataProvider.h>
#include <dataproviders/PowerStatsEnergyConsumer.h>
#include <ZumaCommonDataProviders.h>
#include <ZumaProCommonDataProviders.h>
#include <PowerStatsAidl.h>
#include <android-base/logging.h>
@ -35,11 +35,11 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats
std::vector<std::string> states = {
"Off",
"LP: 1080x2340@30",
"On: 1080x2340@60",
"On: 1080x2340@90",
"HBM: 1080x2340@60",
"HBM: 1080x2340@90"};
"LP: 1440x3120@30",
"On: 1440x3120@60",
"On: 1440x3120@90",
"HBM: 1440x3120@60",
"HBM: 1440x3120@90"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Display",
@ -47,13 +47,11 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
states));
// Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(
p, EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display",
{{"LP: 1080x2340@30", 1},
{"On: 1080x2340@60", 2},
{"On: 1080x2340@90", 3},
{"HBM: 1080x2340@60", 4},
{"HBM: 1080x2340@90", 5}}));
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
p,
EnergyConsumerType::DISPLAY,
"Display",
{"VSYS_PWR_DISPLAY"}));
}
int main() {
@ -64,7 +62,7 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addZumaCommonDataProviders(p);
addZumaProCommonDataProviders(p);
addDisplay(p);
const std::string instance = std::string() + PowerStats::descriptor + "/default";