Merge "powerstats: update specific data provider configurations" into tm-qpr-dev
This commit is contained in:
commit
27e8a8fda6
2 changed files with 49 additions and 1 deletions
|
@ -16,6 +16,7 @@ soong_namespace {
|
|||
imports: [
|
||||
"hardware/google/pixel",
|
||||
"device/google/gs201/powerstats",
|
||||
"device/google/gs-common/powerstats",
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -38,5 +39,6 @@ cc_binary {
|
|||
|
||||
shared_libs: [
|
||||
"android.hardware.power.stats-impl.gs201",
|
||||
"android.hardware.power.stats-impl.gs-common",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
#include <dataproviders/DisplayStateResidencyDataProvider.h>
|
||||
#include <dataproviders/PowerStatsEnergyConsumer.h>
|
||||
#include <DevfreqStateResidencyDataProvider.h>
|
||||
#include <Gs201CommonDataProviders.h>
|
||||
#include <PowerStatsAidl.h>
|
||||
|
||||
|
@ -27,6 +28,7 @@
|
|||
#include <android/binder_process.h>
|
||||
#include <log/log.h>
|
||||
|
||||
using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider;
|
||||
using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
|
||||
using aidl::android::hardware::power::stats::EnergyConsumerType;
|
||||
using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
|
||||
|
@ -50,6 +52,39 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
|
|||
{"VSYS_PWR_DISPLAY"}));
|
||||
}
|
||||
|
||||
void addGPUGs202(std::shared_ptr<PowerStats> p) {
|
||||
std::map<std::string, int32_t> stateCoeffs;
|
||||
|
||||
// Add GPU state residency
|
||||
p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
|
||||
"GPU",
|
||||
"/sys/devices/platform/28000000.mali"));
|
||||
|
||||
// Add GPU energy consumer
|
||||
stateCoeffs = {
|
||||
{"202000", 890},
|
||||
{"251000", 1102},
|
||||
{"302000", 1308},
|
||||
{"351000", 1522},
|
||||
{"400000", 1772},
|
||||
{"434000", 1931},
|
||||
{"471000", 2105},
|
||||
{"510000", 2292},
|
||||
{"572000", 2528},
|
||||
{"633000", 2811},
|
||||
{"701000", 3127},
|
||||
{"762000", 3452},
|
||||
{"848000", 4044}};
|
||||
|
||||
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(
|
||||
p,
|
||||
EnergyConsumerType::OTHER,
|
||||
"GPU",
|
||||
{"S2S_VDD_G3D", "S8S_VDD_G3D_L2"},
|
||||
{{UID_TIME_IN_STATE, "/sys/devices/platform/28000000.mali/uid_time_in_state"}},
|
||||
stateCoeffs));
|
||||
}
|
||||
|
||||
int main() {
|
||||
LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting.";
|
||||
|
||||
|
@ -58,8 +93,19 @@ int main() {
|
|||
|
||||
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
|
||||
|
||||
addGs201CommonDataProvidersBig(p);
|
||||
setEnergyMeter(p);
|
||||
addAoC(p);
|
||||
addPixelStateResidencyDataProvider(p);
|
||||
addCPUclusters(p);
|
||||
addDisplay(p);
|
||||
addSoC(p);
|
||||
addWifi(p);
|
||||
addTPU(p);
|
||||
addUfs(p);
|
||||
addPowerDomains(p);
|
||||
addDevfreq(p);
|
||||
addGPUGs202(p);
|
||||
addDvfsStats(p);
|
||||
|
||||
const std::string instance = std::string() + PowerStats::descriptor + "/default";
|
||||
binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue