From 81123556364be405db20916f4171aa2c296f2ae2 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Wed, 12 Oct 2022 17:54:20 +0800
Subject: [PATCH] powerstats: update GPU DVFS to fix GPU EnergyConsumer issue

Failed to create GPU EnergyConsumer due to invalid coefficient
size. The size of GPU coefficient list should be equal to the
size of available GPU DVFS list in uid_time_in_state.

Bug: 243455584
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I7938e3e89d8e1e9a43c49cff60249a723f76b969
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 powerstats/Gs201CommonDataProviders.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp
index 5b3bc2b6..0c5c62c4 100644
--- a/powerstats/Gs201CommonDataProviders.cpp
+++ b/powerstats/Gs201CommonDataProviders.cpp
@@ -318,7 +318,6 @@ void addGPU(std::shared_ptr<PowerStats> p) {
 
     // TODO (b/197721618): Measuring the GPU power numbers
     stateCoeffs = {
-        {"151000",  642},
         {"202000",  890},
         {"251000", 1102},
         {"302000", 1308},
@@ -614,10 +613,6 @@ void addCommonDataProviders(std::shared_ptr<PowerStats> p) {
     addPowerDomains(p);
     addDevfreq(p);
     addTPU(p);
-
-    // TODO (b/181070764) (b/182941084):
-    // Remove this when Wifi/BT energy consumption models are available or revert before ship
-    addPlaceholderEnergyConsumers(p);
 }
 
 void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {