From 47adfbe5fa888462d5ca77f6e91c93c623e62d93 Mon Sep 17 00:00:00 2001 From: Jenny Ho Date: Tue, 20 Sep 2022 12:37:31 +0800 Subject: [PATCH 1/4] init: add permission to adjust wlc fan alarm level Bug: 246486657 Signed-off-by: Jenny Ho Change-Id: Id02b6e415aad9f5dae081c45e4db667c27966130 --- conf/init.gs201.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index b24b14e7..69243c71 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -254,6 +254,10 @@ on init # Thermal Charge stats (write 0) chown system system /sys/devices/platform/google,charger/thermal_stats + # Permission for wireless charging fan + chown system system /sys/devices/platform/google,charger/thermal_dc_fan_alarm + chown system system /sys/devices/platform/google,cpm/thermal_mdis_fan_alarm + # Permission for wireless charging chown system system /sys/class/power_supply/wireless/capacity chown system system /sys/class/power_supply/wireless/device/rtx From e4c0888a1e5d48557dad992ede816110275de2c8 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Tue, 20 Sep 2022 22:16:02 +0800 Subject: [PATCH 2/4] powerstats: change data source for CPU CLx-DVFS CPU CLx-DVFS stats provided by fvp_stats are incorrect. Although acpm stats are closer to final vote results, data accuracy is most important. Change the data source of CPU CLx-DVFS from fvp_stats to soc cpufreq. Bug: 246501821 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I4018f9f561d87140adfba847f2f07c672810aad0 Signed-off-by: Darren Hsu --- powerstats/Gs201CommonDataProviders.cpp | 67 ++++--------------------- 1 file changed, 9 insertions(+), 58 deletions(-) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 7a01405d..5b3bc2b6 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -169,64 +169,6 @@ void addDvfsStats(std::shared_ptr p) { std::vector cfgs; - cfgs.push_back({"CL0", { - std::make_pair("2024MHz", "2024000"), - std::make_pair("1950MHz", "1950000"), - std::make_pair("1803MHz", "1803000"), - std::make_pair("1704MHz", "1704000"), - std::make_pair("1598MHz", "1598000"), - std::make_pair("1401MHz", "1401000"), - std::make_pair("1328MHz", "1328000"), - std::make_pair("1197MHz", "1197000"), - std::make_pair("1098MHz", "1098000"), - std::make_pair("930MHz", "930000"), - std::make_pair("738MHz", "738000"), - std::make_pair("574MHz", "574000"), - std::make_pair("300MHz", "300000"), - std::make_pair("0MHz", "0"), - }}); - - cfgs.push_back({"CL1", { - std::make_pair("2348MHz", "2348000"), - std::make_pair("2253MHz", "2253000"), - std::make_pair("2130MHz", "2130000"), - std::make_pair("1999MHz", "1999000"), - std::make_pair("1836MHz", "1836000"), - std::make_pair("1663MHz", "1663000"), - std::make_pair("1491MHz", "1491000"), - std::make_pair("1328MHz", "1328000"), - std::make_pair("1197MHz", "1197000"), - std::make_pair("1024MHz", "1024000"), - std::make_pair("910MHz", "910000"), - std::make_pair("799MHz", "799000"), - std::make_pair("696MHz", "696000"), - std::make_pair("553MHz", "553000"), - std::make_pair("400MHz", "400000"), - std::make_pair("0MHz", "0"), - }}); - - cfgs.push_back({"CL2", { - std::make_pair("2850MHz", "2850000"), - std::make_pair("2802MHz", "2802000"), - std::make_pair("2704MHz", "2704000"), - std::make_pair("2630MHz", "2630000"), - std::make_pair("2507MHz", "2507000"), - std::make_pair("2401MHz", "2401000"), - std::make_pair("2252MHz", "2252000"), - std::make_pair("2188MHz", "2188000"), - std::make_pair("2048MHz", "2048000"), - std::make_pair("1826MHz", "1826000"), - std::make_pair("1745MHz", "1745000"), - std::make_pair("1582MHz", "1582000"), - std::make_pair("1426MHz", "1426000"), - std::make_pair("1277MHz", "1277000"), - std::make_pair("1106MHz", "1106000"), - std::make_pair("984MHz", "984000"), - std::make_pair("851MHz", "851000"), - std::make_pair("500MHz", "500000"), - std::make_pair("0MHz", "0"), - }}); - cfgs.push_back({"TPU", { std::make_pair("1066MHz", "1066000"), std::make_pair("845MHz", "845000"), @@ -353,6 +295,15 @@ void addCPUclusters(std::shared_ptr p) { p->addStateResidencyDataProvider(std::make_unique( "/sys/devices/platform/acpm_stats/core_stats", cfgs)); + p->addStateResidencyDataProvider(std::make_unique( + "CL0", "/sys/devices/system/cpu/cpufreq/policy0/stats")); + + p->addStateResidencyDataProvider(std::make_unique( + "CL1", "/sys/devices/system/cpu/cpufreq/policy4/stats")); + + p->addStateResidencyDataProvider(std::make_unique( + "CL2", "/sys/devices/system/cpu/cpufreq/policy6/stats")); + p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(p, EnergyConsumerType::CPU_CLUSTER, "CPUCL0", {"S4M_VDD_CPUCL0"})); p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(p, From d89cff2fdbdd7906a8760697ba707ac18085543a Mon Sep 17 00:00:00 2001 From: wenchangliu Date: Tue, 20 Sep 2022 18:12:01 +0800 Subject: [PATCH 3/4] [DO NOT MERGE] temporal remove CQ mode for HEVC encoder We are too late to upgrade the latest version of libyuv in Android T to fix color conversion (BT.709 YUV to RGB) accuracy issue in HeifWriterTest when we exposed CQ mode for H/W hevc encoder. Move CQ mode support in Android U. Note: remove CQ mode support, HeifWriterTest will use software hevc encoder to run the test. Since software encoder only support 512x512 resolution the default color primary is using BT.601 which will not meet color accuracy issue. Bug: 242466144 Test: atest android.media.misc.cts.HeifWriterTest Change-Id: Iad6524c94937bffdc061f36973ffd41a525a181e --- media_codecs_aosp_c2.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml index bae71e61..ea96e21b 100644 --- a/media_codecs_aosp_c2.xml +++ b/media_codecs_aosp_c2.xml @@ -176,13 +176,12 @@ - - + From 65b6f927888a4d472b169eac378cdc0fd92ea9d1 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 19 Sep 2022 21:31:16 +0000 Subject: [PATCH 4/4] Include Dolby codecs Include Dolby codecs for non-AOSP builds. Bug: 244253825 Test: verify DD+ decoding is chosen by streaming app Change-Id: Ib4f2e4fc49d8786c38234f40313ef40e4e15972f --- media_codecs_bo_c2.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml index a198a5ae..7830b9c9 100644 --- a/media_codecs_bo_c2.xml +++ b/media_codecs_bo_c2.xml @@ -15,6 +15,7 @@ --> +