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

Snap for 11816316 from e30a0af74e to 24Q3-release

Browse source 
Change-Id: I73af012e4430490097b4a272b33e0bd7a5165091
This commit is contained in:
Android Build Coastguard Worker 2024-05-08 23:03:39 +00:00
commit 1b941a6764
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
device_framework_matrix_product.xml
View file

@ -114,7 +114,7 @@
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>com.google.hardware.pixel.display</name> <name>com.google.hardware.pixel.display</name>
<version>11</version> <version>11-12</version>
<interface> <interface>
<name>IDisplay</name> <name>IDisplay</name>
<instance>default</instance> <instance>default</instance>

13
powerstats/ZumaProCommonDataProviders.cpp
View file

@ -365,7 +365,7 @@ void addGPU(std::shared_ptr<PowerStats> p) {
{"890000", 4333}}; {"890000", 4333}};
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
EnergyConsumerType::OTHER, "GPU", {"S2S_VDD_G3D", "S8S_VDD_G3D_L2"}, EnergyConsumerType::OTHER, "GPU", {"S2S_VDD_G3D"},
{{UID_TIME_IN_STATE, path + "/uid_time_in_state"}}, {{UID_TIME_IN_STATE, path + "/uid_time_in_state"}},
stateCoeffs)); stateCoeffs));
@ -638,12 +638,15 @@ void addTPU(std::shared_ptr<PowerStats> p) {
stateCoeffs = { stateCoeffs = {
// TODO (b/197721618): Measuring the TPU power numbers // TODO (b/197721618): Measuring the TPU power numbers
{"226000", 10}, {"226000", 10},
{"627000", 20}, {"455000", 20},
{"845000", 30}, {"627000", 30},
{"1066000", 40}}; {"712000", 40},
{"845000", 50},
{"967000", 60}, // Do not change to 1066000
{"1119000", 70}};
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
EnergyConsumerType::OTHER, "TPU", {"S10M_VDD_TPU"}, EnergyConsumerType::OTHER, "TPU", {"S7M_VDD_TPU"},
{{UID_TIME_IN_STATE, "/sys/class/edgetpu/edgetpu-soc/device/tpu_usage"}}, {{UID_TIME_IN_STATE, "/sys/class/edgetpu/edgetpu-soc/device/tpu_usage"}},
stateCoeffs)); stateCoeffs));
} }