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

powerstats: correct display odpm rail name

Browse source 
Bug: 194651088
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I40b1ab79c64a26008746933fd293064ff69eeebd
This commit is contained in:
samou 2021-07-29 07:38:05 +00:00 • committed by Thierry Strudel
parent 4a6d0b7b8e
commit f1820dbcbd
2 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
powerstats/oriole/service.cpp
View file

@ -31,6 +31,13 @@ using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
using aidl::android::hardware::power::stats::EnergyConsumerType; using aidl::android::hardware::power::stats::EnergyConsumerType;
using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
const char kBootRevision[] = "ro.boot.revision";
std::map<std::string, std::string> displayChannelNames = {
{"PROTO1.0", "PPVAR_VSYS_PWR_DISP"},
{"EVT1.0", "PPVAR_VSYS_PWR_DISP"},
{"EVT1.1", "VSYS_PWR_DISPLAY"},
};
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats // Add display residency stats
std::vector<std::string> states = { std::vector<std::string> states = {
@ -45,13 +52,22 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
"/sys/class/backlight/panel0-backlight/state", "/sys/class/backlight/panel0-backlight/state",
states)); states));
std::string rev = android::base::GetProperty(kBootRevision, "");
std::string channelName;
if (displayChannelNames.find(rev) == displayChannelNames.end()) {
channelName = displayChannelNames["EVT1.1"];
} else {
channelName = displayChannelNames[rev];
}
// Add display energy consumer // Add display energy consumer
/* /*
* TODO(b/167216667): Add correct display power model here. Must read from display rail * TODO(b/167216667): Add correct display power model here. Must read from display rail
* and include proper coefficients for display states. * and include proper coefficients for display states.
*/ */
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", EnergyConsumerType::DISPLAY, "display", {channelName}, "Display",
{{"LP: 1080x2400@30", 1}, {{"LP: 1080x2400@30", 1},
{"On: 1080x2400@60", 2}, {"On: 1080x2400@60", 2},
{"On: 1080x2400@90", 3}, {"On: 1080x2400@90", 3},

18
powerstats/raven/service.cpp
View file

@ -33,6 +33,13 @@ using aidl::android::hardware::power::stats::EnergyConsumerType;
using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider; using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider;
using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
const char kBootRevision[] = "ro.boot.revision";
std::map<std::string, std::string> displayChannelNames = {
{"PROTO1.0", "PPVAR_VSYS_PWR_DISP"},
{"EVT1.0", "PPVAR_VSYS_PWR_DISP"},
{"EVT1.1", "VSYS_PWR_DISPLAY"},
};
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats // Add display residency stats
std::vector<std::string> states = { std::vector<std::string> states = {
@ -51,13 +58,22 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
"/sys/class/backlight/panel0-backlight/state", "/sys/class/backlight/panel0-backlight/state",
states)); states));
std::string rev = android::base::GetProperty(kBootRevision, "");
std::string channelName;
if (displayChannelNames.find(rev) == displayChannelNames.end()) {
channelName = displayChannelNames["EVT1.1"];
} else {
channelName = displayChannelNames[rev];
}
// Add display energy consumer // Add display energy consumer
/* /*
* TODO(b/167216667): Add correct display power model here. Must read from display rail * TODO(b/167216667): Add correct display power model here. Must read from display rail
* and include proper coefficients for display states. * and include proper coefficients for display states.
*/ */
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", EnergyConsumerType::DISPLAY, "display", {channelName}, "Display",
{{"LP: 1440x3120@10", 1}, {{"LP: 1440x3120@10", 1},
{"LP: 1440x3120@30", 2}, {"LP: 1440x3120@30", 2},
{"On: 1440x3120@10", 3}, {"On: 1440x3120@10", 3},