From 7a77f284ec0e962d007140dfbb6d0967a1a7cd34 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Mon, 27 Feb 2023 15:23:36 +0000 Subject: [PATCH 1/9] powerhint.json: Update uclamp_min hint to account for margin Upstream has fixed relationship between uclamp_min and margin which means uclamp_min value between 80-100% of capacity of the CPU is a valid value and will not cause upmigration. To keep the current hints in powerhint.json the same, we must update uclamp_min to be capacity_orig_of(medium_cpu) + 1. This change is dependent on uclamp vs fits margin in GKI, vendor modules. And an improvement in sched_pixel to ignore the 25% boost if the only reason to request the frequency is uclamp_min. To cater for the later - we multiply each uclamp_min value with 1.25 - except ones that look intentionally set around capacity boundaries. Bug: 261695590 Test: PtsUiBench Signed-off-by: Qais Yousef Change-Id: I1e6889ebea9877cb23708722a73e97177e6be185 --- powerhint.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/powerhint.json b/powerhint.json index 350fe79..ba73ede 100644 --- a/powerhint.json +++ b/powerhint.json @@ -148,7 +148,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", "Values": [ - "612", + "764", "0" ], "ResetOnInit": true @@ -157,7 +157,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "612", + "764", "1" ], "ResetOnInit": true @@ -175,8 +175,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "650" + "225", + "813" ], "DefaultIndex": 0, "ResetOnInit": true @@ -643,7 +643,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "612" + "Value": "764" }, { "PowerHint": "LAUNCH", @@ -773,7 +773,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "612" + "Value": "764" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1938,7 +1938,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "650" + "Value": "813" }, { "PowerHint": "ML_ACC", @@ -1960,8 +1960,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 145, - "UclampMin_High": 411, + "UclampMin_Init": 182, + "UclampMin_High": 514, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1987,9 +1987,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2011,9 +2011,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2035,7 +2035,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, From 826c53b94546bff84857908c6080c8ba9af92a5e Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 12 Apr 2023 20:31:07 +0800 Subject: [PATCH 2/9] powerhint: Boost GPU(302000) by 1st frame Take CPU_LOAD_RESET hint to boost the GPU freq to 302000 Bug: 243025173 Test: Manual Change-Id: I57da44fc7e7c11e84241cccf81f83b4ce22768fa --- powerhint.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/powerhint.json b/powerhint.json index 350fe79..89d5312 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1,5 +1,18 @@ { "Nodes": [ + { + "Name": "GPUMinFreq", + "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", + "Values": [ + "848000", + "762000", + "572000", + "471000", + "302000", + "202000" + ], + "ResetOnInit": true + }, { "Name": "MemFreq", "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", @@ -102,19 +115,6 @@ ], "ResetOnInit": true }, - { - "Name": "GPUMinFreq", - "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", - "Values": [ - "848000", - "762000", - "572000", - "471000", - "302000", - "202000" - ], - "ResetOnInit": true - }, { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", @@ -721,6 +721,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "GPUMinFreq", + "Duration": 50, + "Value": "302000" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "MemFreq", @@ -1478,12 +1484,6 @@ "Duration": 0, "Value": "572000" }, - { - "PowerHint": "ADPF_FIRST_FRAME", - "Node": "GPUMinFreq", - "Duration": 50, - "Value": "302000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", From d968a78b045b72c5caa395550e394c7682146cfa Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Thu, 13 Apr 2023 09:59:59 +0800 Subject: [PATCH 3/9] audio: disable raw for USB Dock Bug: 277806508 Test: build pass Change-Id: Iecb4ce699f6c5a42b3833d8e168fc5142b3f2975 Signed-off-by: Carter Hsu --- audio/tangorpro/config/audio_policy_configuration.xml | 2 +- .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index 5f65034..23ff9cf 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -201,7 +201,7 @@ + sources="primary output,deep buffer,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> Date: Thu, 13 Apr 2023 17:32:56 -0700 Subject: [PATCH 4/9] Enable updating country code from scan results for generic case Bug: 271928725 Bug: 267944733 Test: manually test Change-Id: I8fdad7c5793657c9b6293315f67bb25b858c50da --- rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 87be16b..221b9e3 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -133,4 +133,10 @@ true + + + true From 1d12d453cb8ecc69da8bc2192929f275de7c38f5 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Tue, 18 Apr 2023 13:05:34 +0000 Subject: [PATCH 5/9] [USB Audio] Enable 192k support sample rate to hifi usb related cl: ag/22549253 Test: Local Test. Bug: 198122814 Change-Id: Ic40638a9bd9e341c6f1e0ccf4d43e6d852a4d357 --- audio/tangorpro/config/audio_platform_configuration.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml index 279fe69..f8fb665 100644 --- a/audio/tangorpro/config/audio_platform_configuration.xml +++ b/audio/tangorpro/config/audio_platform_configuration.xml @@ -289,7 +289,7 @@ - + From bf23d4c93219a734953c61bdb093c22e9cd73848 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Mon, 17 Apr 2023 19:12:57 +0000 Subject: [PATCH 6/9] [SWB] Enable super wideband Enable SWB by setting system property Tag: #feature Bug: 277338500 Test: flash devices and check property Change-Id: I4862bf8ddbd9f9f34d8588bc6068f0dc6baff399 --- bluetooth/syna_default.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk index 43d9198..72a3015 100644 --- a/bluetooth/syna_default.mk +++ b/bluetooth/syna_default.mk @@ -15,6 +15,10 @@ # limitations under the License. # +# Bluetooth Super Wide Band +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.hfp.swb.supported=true + # Bluetooth LE Audio PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_switcher.supported=true \ From 75b7e49503df7d9dcc1ce677cd331f4e248d38ed Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Thu, 13 Apr 2023 09:59:59 +0800 Subject: [PATCH 7/9] audio: disable raw for USB Dock Bug: 277806508 Test: build pass Change-Id: Iecb4ce699f6c5a42b3833d8e168fc5142b3f2975 Signed-off-by: Carter Hsu --- audio/tangorpro/config/audio_policy_configuration.xml | 2 +- .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index d887c08..78c8ea3 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -201,7 +201,7 @@ + sources="primary output,deep buffer,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> + sources="primary output,deep buffer,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/> Date: Thu, 20 Apr 2023 08:46:30 +0000 Subject: [PATCH 8/9] Enable load kernel modules in parallel enable load kernel modules in parallel but load some specific modules in sequential Test: reboot more than 500 times without failure Bug: 229794277 Change-Id: I41cb5a09fb88ff7faa5ec12f71209b35cd941948 Signed-off-by: Chungkai Mei --- tangorpro/BoardConfig.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index fdd1772..0aca763 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -16,6 +16,12 @@ TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := tangorpro +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 + ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else From c14f209f3072e31d71ea642bd301a08ac70ab1b9 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 20 Apr 2023 18:43:34 +0800 Subject: [PATCH 9/9] Add device mk OWNERS Bug: 278167548 Change-Id: Iefda389e70117b401d20590e387d368737e03e50 --- OWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OWNERS b/OWNERS index 1451bd8..79003ba 100644 --- a/OWNERS +++ b/OWNERS @@ -1 +1,4 @@ per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com + +# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS