From 7ebc0804585979a2e49cf7c85335a645daeb1dcd Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 3 Sep 2021 10:34:01 +0800 Subject: [PATCH 1/3] audio: update music playback volume curve - changes volume 1,2,3,4,5 (due to a sound quality noise floor issue) Bug: 198224217 Test: manual power test (b/198224217#comment21) Signed-off-by: Jasmine Cha Change-Id: Ied7e88ad941e8a13e2080da6e2897b9541966dd0 --- audio/raven/config/audio_policy_volumes.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/audio/raven/config/audio_policy_volumes.xml b/audio/raven/config/audio_policy_volumes.xml index cd0e3a4..eae4c9a 100644 --- a/audio/raven/config/audio_policy_volumes.xml +++ b/audio/raven/config/audio_policy_volumes.xml @@ -79,8 +79,12 @@ volume index from 0 to 100. ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/> - + + 1,-6000 + 20,-4790 + 60,-2140 + 100,0 + Date: Thu, 2 Sep 2021 14:26:57 -0700 Subject: [PATCH 2/3] raviole: clean up kernel variables 1) make TARGET_KERNEL_DIR assignment conditional 2) add TARGET_BOARD_KERNEL_HEADERS Bug: 198682676 Change-Id: Ica7d816bb421341f3620e156796ef611f437d688 --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- device-slider.mk | 3 ++- device-whitefin.mk | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index e58ce7e..6508181 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -14,7 +14,8 @@ # limitations under the License. # -TARGET_KERNEL_DIR := device/google/raviole-kernel +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) diff --git a/device-raven.mk b/device-raven.mk index c0190a0..dd8478b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -14,7 +14,8 @@ # limitations under the License. # -TARGET_KERNEL_DIR := device/google/raviole-kernel +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) diff --git a/device-slider.mk b/device-slider.mk index f4e6b57..8acb9ff 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -14,7 +14,8 @@ # limitations under the License. # -TARGET_KERNEL_DIR := device/google/raviole-kernel +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) diff --git a/device-whitefin.mk b/device-whitefin.mk index 17e4d45..a61250b 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -14,7 +14,8 @@ # limitations under the License. # -TARGET_KERNEL_DIR := device/google/raviole-kernel +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) From e60ba10e86a41d2a8f9cab2daa95c2bebf3a992c Mon Sep 17 00:00:00 2001 From: Jia-yi Chen Date: Tue, 31 Aug 2021 13:00:37 -0700 Subject: [PATCH 3/3] Adjust PID loop parameters to relax GPU throttling for MODERATE Test: Boot Bug: 198291571 Change-Id: I606d4342fc92bc2d2c5552ea5e0ced1603e972fa --- thermal_info_config_oriole.json | 10 +++++----- thermal_info_config_raven.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 8f79c35..7e201c0 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -331,7 +331,7 @@ "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3500, 1500, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 3500, 1800, "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"] @@ -339,7 +339,7 @@ "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "CdevWeightForPID": [0.085, 0.085, 0.085, 0.085, 0.085, 0.085, 0.085], + "CdevWeightForPID": [0.07, 0.07, 0.07, 0.07, 0.07, 0.07, 0.07], "CdevCeiling": [3, 3, 6, 7, 8, 10, 10], "LimitInfo": [0, 0, 0, 0, 8, 10, 10], "BindedPowerRail": "S4M_VDD_CPUCL0", @@ -348,7 +348,7 @@ }, { "CdevRequest": "thermal-cpufreq-1", - "CdevWeightForPID": [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], + "CdevWeightForPID": [0.066, 0.066, 0.066, 0.066, 0.066, 0.066, 0.066], "CdevCeiling": [7, 7, 8, 9, 11, 13, 13], "LimitInfo": [0, 0, 0, 0, 11, 13, 13], "BindedPowerRail": "S3M_VDD_CPUCL1", @@ -357,7 +357,7 @@ }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38], + "CdevWeightForPID": [0.313, 0.313, 0.313, 0.313, 0.313, 0.313, 0.313], "CdevCeiling": [11, 11, 14, 14, 14, 16, 16], "LimitInfo": [0, 0, 0, 0, 14, 16, 16], "BindedPowerRail": "S2M_VDD_CPUCL2", @@ -366,7 +366,7 @@ }, { "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [0.455, 0.455, 0.455, 0.455, 0.455, 0.455, 0.455], + "CdevWeightForPID": [0.551, 0.551, 0.551, 0.551, 0.551, 0.551, 0.551], "CdevCeiling": [7, 7, 8, 9, 10, 11, 11], "LimitInfo": [0, 0, 0, 0, 10, 11, 11], "BindedPowerRail": "S2S_VDD_G3D", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index fc23f6a..66f5af7 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -331,7 +331,7 @@ "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3500, 1500, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 3500, 1800, "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"] @@ -339,7 +339,7 @@ "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "CdevWeightForPID": [0.085, 0.085, 0.085, 0.085, 0.085, 0.085, 0.085], + "CdevWeightForPID": [0.07, 0.07, 0.07, 0.07, 0.07, 0.07, 0.07], "CdevCeiling": [3, 3, 6, 7, 8, 10, 10], "LimitInfo": [0, 0, 0, 0, 8, 10, 10], "BindedPowerRail": "S4M_VDD_CPUCL0", @@ -348,7 +348,7 @@ }, { "CdevRequest": "thermal-cpufreq-1", - "CdevWeightForPID": [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], + "CdevWeightForPID": [0.066, 0.066, 0.066, 0.066, 0.066, 0.066, 0.066], "CdevCeiling": [7, 7, 8, 9, 11, 13, 13], "LimitInfo": [0, 0, 0, 0, 11, 13, 13], "BindedPowerRail": "S3M_VDD_CPUCL1", @@ -357,7 +357,7 @@ }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.38, 0.38, 0.38, 0.38, 0.38, 0.38, 0.38], + "CdevWeightForPID": [0.313, 0.313, 0.313, 0.313, 0.313, 0.313, 0.313], "CdevCeiling": [11, 11, 14, 14, 14, 16, 16], "LimitInfo": [0, 0, 0, 0, 14, 16, 16], "BindedPowerRail": "S2M_VDD_CPUCL2", @@ -366,7 +366,7 @@ }, { "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [0.455, 0.455, 0.455, 0.455, 0.455, 0.455, 0.455], + "CdevWeightForPID": [0.551, 0.551, 0.551, 0.551, 0.551, 0.551, 0.551], "CdevCeiling": [7, 7, 8, 9, 10, 11, 11], "LimitInfo": [0, 0, 0, 0, 10, 11, 11], "BindedPowerRail": "S2S_VDD_G3D",