From e6eb11886e2585187a2f277f3740c334d02574df Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Feb 2024 23:17:39 +0000 Subject: [PATCH 01/31] Update oriole SVN to 79 Bug: 325156176 Change-Id: I7e6ba5fad48ee6b94f8452596c819bdf64b1c567 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4c2706e..32a0862 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -208,7 +208,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=78 + ro.vendor.build.svn=79 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 4104a4d4b5de569f1a1b2e386305d66116f808fb Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Feb 2024 23:55:23 +0000 Subject: [PATCH 02/31] Update raven SVN to 79 Bug: 325156176 Change-Id: Ic942d23db321ac036f4ad3ace6ef7b1291797b2d --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 51f3904..eebd27e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -212,7 +212,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=78 + ro.vendor.build.svn=79 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From cf99a5400d7ff3a245a11e6f59dd097c22fc669e Mon Sep 17 00:00:00 2001 From: Kimi Hsu Date: Thu, 29 Feb 2024 08:32:39 +0000 Subject: [PATCH 03/31] Use rounded corner radius from max resolution Bug: 326046204 Test: try WindowInsets#getRoundedCorner Flag: NONE Change-Id: Ib01a250137447b833f7fad47e0076291993b652d --- raven/overlay/frameworks/base/core/res/res/values/config.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index c8d8730..ea1bd1d 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -43,7 +43,9 @@ - 50px + 67px + 67px + 66px 5px From 38c977c9ad750183e9a117423fc5b7016f87e766 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Feb 2024 23:19:24 +0000 Subject: [PATCH 04/31] Update oriole SVN to 80 Bug: 325156176 Change-Id: I9d8db34bb775bb8a24dffccdc203df3f04c1a279 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 32a0862..49eecec 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -208,7 +208,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=79 + ro.vendor.build.svn=80 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From a5d57c7d7c7ce19e77d9e958547f76de47a62237 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Feb 2024 23:58:50 +0000 Subject: [PATCH 05/31] Update raven SVN to 80 Bug: 325156176 Change-Id: I215f2ff08b59afa8c2de01edc13e0478fa16f4aa --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index eebd27e..1e47e91 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -212,7 +212,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=79 + ro.vendor.build.svn=80 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 40affb80c7ff29040e7f82d50d926ab1a0571d1c Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 8 Mar 2024 18:29:57 +0800 Subject: [PATCH 06/31] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: I305d2f459d45fbdcd3fb5e26f031ff4931bbbfd9 Signed-off-by: Nina Chen --- device-oriole.mk | 11 ++++++----- device-raven.mk | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 49eecec..3fcbfe1 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -17,16 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers - ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) diff --git a/device-raven.mk b/device-raven.mk index 1e47e91..7503576 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -17,16 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers - ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/raviole-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers endif $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk) From f5439f1e844dedd9f8a96b29a2e1ced3270f3ef4 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Feb 2024 23:28:21 +0000 Subject: [PATCH 07/31] Update oriole SVN to 81 Bug: 325156176 Change-Id: I52b41275757b3b6ed9335412c00b2244c040298d --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 3fcbfe1..7d22619 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -209,7 +209,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=80 + ro.vendor.build.svn=81 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 75f2060945123abce1528e1fbc4828e3541a334c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 00:00:23 +0000 Subject: [PATCH 08/31] Update raven SVN to 81 Bug: 325156176 Change-Id: Id52b92f08a2ab38985ad4df391d904548c21d8ed --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 7503576..183cd14 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -213,7 +213,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=80 + ro.vendor.build.svn=81 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From fb927e4184ea67ca3e4b09bd9138e474538725a4 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 6 Mar 2024 00:56:24 +0000 Subject: [PATCH 09/31] Update oriole SVN to 82 Bug: 325156176 Change-Id: I35f54125ce811d5788dc4bb779da6cb0da97c1b3 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 7d22619..c2a0d58 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -209,7 +209,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=81 + ro.vendor.build.svn=82 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 4b6dd87db01d718816d8a5a3c8e0d382a5f06631 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 6 Mar 2024 00:59:00 +0000 Subject: [PATCH 10/31] Update raven SVN to 82 Bug: 325156176 Change-Id: I2d9b565dd6e97439876096ae7e5c88678b178087 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 183cd14..1efc369 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -213,7 +213,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=81 + ro.vendor.build.svn=82 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 158e5fb33e880ca91ef7f1c5db16f8bc37a7f8b5 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Thu, 14 Mar 2024 16:02:55 +0000 Subject: [PATCH 11/31] powerhint: set uclampmin_init value for applying CPU Load boost Bug: 329483662 Test: Manual Test Change-Id: Ic8490589ee2521d8a6295b701cc169dbc8302e49 --- powerhint-oriole-mainline.json | 6 +++--- powerhint-oriole.json | 6 +++--- powerhint-raven-mainline.json | 6 +++--- powerhint-raven.json | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json index 55adc6b..2b7eb1f 100644 --- a/powerhint-oriole-mainline.json +++ b/powerhint-oriole-mainline.json @@ -1229,7 +1229,7 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 232, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1253,7 +1253,7 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1277,7 +1277,7 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 47e6bf1..7bc672b 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1745,7 +1745,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 232, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1769,7 +1769,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1793,7 +1793,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, diff --git a/powerhint-raven-mainline.json b/powerhint-raven-mainline.json index 89e38f0..ed69938 100644 --- a/powerhint-raven-mainline.json +++ b/powerhint-raven-mainline.json @@ -1210,7 +1210,7 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 232, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1234,7 +1234,7 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1258,7 +1258,7 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, diff --git a/powerhint-raven.json b/powerhint-raven.json index ebd95a5..09cc5d3 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1726,7 +1726,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 232, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1750,7 +1750,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1774,7 +1774,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, From eec592871f2e47398912c07d16704c90db252504 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 28 Mar 2024 15:25:35 +0000 Subject: [PATCH 12/31] Update oriole SVN to 83 Bug: 330382848 Change-Id: I7e4511d4c55bf6ba9cf58400cff7f0551a198638 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index c2a0d58..bf6a53b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -209,7 +209,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=82 + ro.vendor.build.svn=83 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 5f1473c89d4d443a1a07f8297f410f20f68ddb9b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 28 Mar 2024 15:27:08 +0000 Subject: [PATCH 13/31] Update raven SVN to 83 Bug: 330382848 Change-Id: I912e6b183cb6f8f4d996d082f8da50ae8b09b337 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 1efc369..e0576c5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -213,7 +213,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=82 + ro.vendor.build.svn=83 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From e626be7a92d7b5a013d2081c0dd2cbaf49d11233 Mon Sep 17 00:00:00 2001 From: Melvin Huang Date: Wed, 3 Apr 2024 23:08:24 +0800 Subject: [PATCH 14/31] R4O6: : Update BQR Event Mask property value Bug: 331942476 Test: Build Pass Change-Id: I737f969b4ac95ec84ff6f26561e0da1c64def093 --- bluetooth/bt_vendor_overlay.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index 4208da8..e12005e 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -2,4 +2,7 @@ BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus +# Update BQR Event Mask property value +BqrEventMaskValueUpdate = 262238 + BtOpusEnabled = true From e448b6f86167f1354cee7e1e12015d4c337c8b0b Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 10 Apr 2024 07:12:22 +0000 Subject: [PATCH 15/31] powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values Bug: 329483662 Test: Manual Test Change-Id: Id0e0ac998b3da529c9d07d5c1dc25037b46c5f9a --- powerhint-oriole-mainline.json | 22 +++++++++------------- powerhint-oriole.json | 24 +++++++++--------------- powerhint-raven-mainline.json | 24 +++++++++--------------- powerhint-raven.json | 24 +++++++++--------------- 4 files changed, 36 insertions(+), 58 deletions(-) diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json index 2b7eb1f..e10d6a9 100644 --- a/powerhint-oriole-mainline.json +++ b/powerhint-oriole-mainline.json @@ -1229,15 +1229,15 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 15 }, @@ -1253,15 +1253,15 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 15 }, @@ -1277,15 +1277,15 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 15 }, @@ -1332,8 +1332,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 5 }, @@ -1356,8 +1354,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 5 } diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 7bc672b..50441f2 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1745,15 +1745,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1769,15 +1769,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1793,15 +1793,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1824,8 +1824,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1848,8 +1846,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1872,8 +1868,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } diff --git a/powerhint-raven-mainline.json b/powerhint-raven-mainline.json index ed69938..f6d6ce1 100644 --- a/powerhint-raven-mainline.json +++ b/powerhint-raven-mainline.json @@ -1210,15 +1210,15 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 15 }, @@ -1234,15 +1234,15 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 15 }, @@ -1258,15 +1258,15 @@ "PID_Do": 500, "PID_Du": 0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 15 }, @@ -1289,8 +1289,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 5 }, @@ -1313,8 +1311,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 5 }, @@ -1337,8 +1333,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0, "TargetTimeFactor": 1, "StaleTimeFactor": 5 } diff --git a/powerhint-raven.json b/powerhint-raven.json index 09cc5d3..7741e22 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1726,15 +1726,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1750,15 +1750,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1774,15 +1774,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1805,8 +1805,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1829,8 +1827,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1853,8 +1849,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } From c55ff3407c4709e483f39ad95f238bcfe88255d8 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:38:08 +0800 Subject: [PATCH 16/31] Switch default kernel directory and change build flag naming Bug: 309749142 Change-Id: If05bbfd7d4b79993fe10c1a206ce78fd3c3e3e5c --- device-oriole.mk | 14 +++----------- device-raven.mk | 14 +++----------- device-slider.mk | 5 +++-- device-whitefin.mk | 5 +++-- 4 files changed, 12 insertions(+), 26 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index bf6a53b..2aa1a9a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -17,18 +17,10 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/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 e0576c5..5a05f00 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -17,18 +17,10 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RAVEN_DIR)/kernel-headers $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) diff --git a/device-slider.mk b/device-slider.mk index b7ca9e6..6be95eb 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -14,8 +14,9 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/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 82c07a8..e618e48 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -14,8 +14,9 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/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 4ecf6b4755b320c40802213bcd38cea4baac8448 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 11 Apr 2024 14:39:56 +0800 Subject: [PATCH 17/31] Branch bootloader prebuilts for 24Q3 release Bug: 326002225 Change-Id: Ibc0b69bd4e5156ca0f6e51a5b2a55fc6e93471f8 --- device-oriole.mk | 8 ++++++-- device-raven.mk | 8 ++++++-- device-slider.mk | 4 +++- device-whitefin.mk | 4 +++- oriole/BoardConfig.mk | 4 +++- raven/BoardConfig.mk | 4 +++- slider/BoardConfig.mk | 4 +++- whitefin/BoardConfig.mk | 4 +++- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2aa1a9a..3322afd 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -43,8 +43,10 @@ include device/google/gs-common/touch/stm/stm11.mk GOODIX_CONFIG_BUILD_VERSION := g6_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk endif @@ -241,8 +243,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk endif diff --git a/device-raven.mk b/device-raven.mk index 5a05f00..bf6b772 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -43,8 +43,10 @@ include device/google/gs-common/touch/lsi/lsi.mk GOODIX_CONFIG_BUILD_VERSION := g6_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk endif @@ -249,8 +251,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk endif diff --git a/device-slider.mk b/device-slider.mk index 6be95eb..299a400 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -108,8 +108,10 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk endif diff --git a/device-whitefin.mk b/device-whitefin.mk index e618e48..e360b1f 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -91,8 +91,10 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk endif diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index a138bc2..b961a92 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -26,8 +26,10 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 70f7077..8a105ed 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -26,8 +26,10 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 0c3d11f..015c854 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -17,8 +17,10 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index e824c17..7163cdd 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -17,8 +17,10 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif From edd9532ef36ea08ae2ca4a17adf207eaa1a87874 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 18 Apr 2024 15:26:16 +0800 Subject: [PATCH 18/31] Switch bootloader directory to control by build flag Bug: 333834221 Change-Id: I2d8ad5079fcd2b8d76148decb996cab0dd375dfb --- device-oriole.mk | 18 ------------------ device-raven.mk | 18 ------------------ device-slider.mk | 9 --------- device-whitefin.mk | 9 --------- oriole/BoardConfig.mk | 12 +++--------- raven/BoardConfig.mk | 12 +++--------- slider/BoardConfig.mk | 12 +++--------- whitefin/BoardConfig.mk | 12 +++--------- 8 files changed, 12 insertions(+), 90 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 3322afd..4b7480a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -41,15 +41,6 @@ include device/google/gs-common/touch/stm/stm11.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk -endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -241,15 +232,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk -endif # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index bf6b772..de04e6c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -41,15 +41,6 @@ include device/google/gs-common/touch/lsi/lsi.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk -endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -249,15 +240,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk -endif # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-slider.mk b/device-slider.mk index 299a400..70b52fc 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -106,15 +106,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk -endif # tetheroffload HAL PRODUCT_PACKAGES += \ diff --git a/device-whitefin.mk b/device-whitefin.mk index e360b1f..23805c4 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -89,15 +89,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk -endif # tetheroffload HAL PRODUCT_PACKAGES += \ diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index b961a92..50c2ba7 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -24,15 +24,9 @@ BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 8a105ed..6a9530e 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -24,15 +24,9 @@ BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)) ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 015c854..55a77a0 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -15,15 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 560 USES_DEVICE_GOOGLE_RAVIOLE := true diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index 7163cdd..1bff3de 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -15,15 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 440 USES_DEVICE_GOOGLE_RAVIOLE := true From 5e29ddf52b953897d95e145afbcac501cca111b1 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 7 Apr 2023 23:11:09 +0000 Subject: [PATCH 19/31] Add POWER_EFFICIENCY uclamp max to adpf config Add the "UclampMax_Efficient" value to the ADPF config in the powerhint.json in order to allow efficient core scheduling for this device. Bug: 277285195 Test: manual Change-Id: I3435eb6fce99afe732623dec813311a19623fde6 --- powerhint-oriole.json | 6 ++++++ powerhint-raven.json | 6 ++++++ powerhint-slider.json | 6 ++++++ powerhint-whitefin.json | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 50441f2..e97fa3a 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1750,6 +1750,7 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1774,6 +1775,7 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1798,6 +1800,7 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1823,6 +1826,7 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -1845,6 +1849,7 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -1867,6 +1872,7 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 diff --git a/powerhint-raven.json b/powerhint-raven.json index 7741e22..3872e3e 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1731,6 +1731,7 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1755,6 +1756,7 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1779,6 +1781,7 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1804,6 +1807,7 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -1826,6 +1830,7 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -1848,6 +1853,7 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 diff --git a/powerhint-slider.json b/powerhint-slider.json index 5726aa9..a18eda1 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -1503,6 +1503,7 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1527,6 +1528,7 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1551,6 +1553,7 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1578,6 +1581,7 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1602,6 +1606,7 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1626,6 +1631,7 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index d44d6f9..20e65c9 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -1470,6 +1470,7 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1494,6 +1495,7 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1518,6 +1520,7 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_Efficient": 400, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1545,6 +1548,7 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1569,6 +1573,7 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1593,6 +1598,7 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_Efficient": 400, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, From 4d90bc1647d2c99362abad405a25df4c8c9526a2 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 2 May 2024 07:30:50 +0000 Subject: [PATCH 20/31] Refactor product inheritance for slider products Add an additional layer of inheritance for `aosp_slider`, `full_slider`, and `aosp_slider_hwasan`. This change adds a common layer of inheritance for non-factory products (slider_generic.mk). This makes it easier to configure factory and non-factory products differently. Non-factory `slider` products now inherits from `device/google/raviole/slider_generic.mk` which inherit from `device/google/raviole/device-slider.mk`. aconfig flags: Flag: EXEMPT mechanical refactoring build flags: Flag: EXEMPT mechanical refactoring Bug: 338332183 Bug: 338333277 Test: lunch aosp_slider-trunk_staging-userdebug && m lunch full_slider-trunk_staging-userdebug && m lunch aosp_slider_hwasan-trunk_staging-userdebug && m Change-Id: If0bbcdf2d4de3c2eca14e514b863f7416ef12e45 --- aosp_slider.mk | 2 +- slider_generic.mk | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 slider_generic.mk diff --git a/aosp_slider.mk b/aosp_slider.mk index 29351f5..9e65926 100644 --- a/aosp_slider.mk +++ b/aosp_slider.mk @@ -14,7 +14,7 @@ # limitations under the License. # $(call inherit-product, device/google/gs101/aosp_common.mk) -$(call inherit-product, device/google/raviole/device-slider.mk) +$(call inherit-product, device/google/raviole/slider_generic.mk) PRODUCT_NAME := aosp_slider PRODUCT_DEVICE := slider diff --git a/slider_generic.mk b/slider_generic.mk new file mode 100644 index 0000000..52d2542 --- /dev/null +++ b/slider_generic.mk @@ -0,0 +1,17 @@ +# +# Copyright 2024 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, device/google/raviole/device-slider.mk) From 89304e99bbc56f1bb4599493c3dd46e9272d14f7 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 2 May 2024 07:41:44 +0000 Subject: [PATCH 21/31] Refactor product inheritance for whitefin products Add an additional layer of inheritance for `aosp_whitefin`, `aosp_whitefin_64`, `aosp_whitefin_pkvm`, and `aosp_whitefin_hwasan`. This change adds a common layer of inheritance for non-factory products (whitefin_generic.mk). This makes it easier to configure factory and non-factory products differently. Non-factory `whitefin` products now inherits from `device/google/raviole/whitefin_generic.mk` which inherit from `device/google/raviole/device-whitefin.mk`. aconfig flags: Flag: EXEMPT mechanical refactoring build flags: Flag: EXEMPT mechanical refactoring Bug: 338332183 Bug: 338332464 Test: lunch aosp_whitefin-trunk_staging-userdebug && m lunch aosp_whitefin_64-trunk_staging-userdebug && m lunch aosp_whitefin_pkvm-trunk_staging-userdebug && m lunch aosp_whitefin_hwasan-trunk_staging-userdebug && m Change-Id: I151d3e59141e566fad54f62ac01ab4372522fd5f --- aosp_whitefin.mk | 2 +- whitefin_generic.mk | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 whitefin_generic.mk diff --git a/aosp_whitefin.mk b/aosp_whitefin.mk index bcdd616..212e7a6 100644 --- a/aosp_whitefin.mk +++ b/aosp_whitefin.mk @@ -14,7 +14,7 @@ # limitations under the License. # $(call inherit-product, device/google/gs101/aosp_common.mk) -$(call inherit-product, device/google/raviole/device-whitefin.mk) +$(call inherit-product, device/google/raviole/whitefin_generic.mk) PRODUCT_NAME := aosp_whitefin PRODUCT_DEVICE := whitefin diff --git a/whitefin_generic.mk b/whitefin_generic.mk new file mode 100644 index 0000000..a56c609 --- /dev/null +++ b/whitefin_generic.mk @@ -0,0 +1,17 @@ +# +# Copyright 2024 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, device/google/raviole/device-whitefin.mk) From 2a09185780a25cd4e187f009a0ae419be7947042 Mon Sep 17 00:00:00 2001 From: Qian-Hao Huang Date: Thu, 2 May 2024 21:08:51 +0800 Subject: [PATCH 22/31] Load fips140.ko before all other kernel modules Bug: 337838109 Bug: 331791671 Change-Id: I4186255ad1b9baccf4f2c1e65560515aa6dc42a2 Signed-off-by: Qian-Hao Huang --- oriole/BoardConfig.mk | 1 + raven/BoardConfig.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 50c2ba7..5b13c0f 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -18,6 +18,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 6a9530e..f47b104 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -18,6 +18,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 From 0b36ca29a6f0fa26e6f4f106027144289f1d690b Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 2 May 2024 05:43:21 +0000 Subject: [PATCH 23/31] Refactor product inheritance for raven products Add an additional layer of inheritance for `aosp_raven`, `aosp_raven_64`, `aosp_raven_pkvm`, `aosp_raven_pgagnostic_64`, `aosp_raven_hwasan`, and `aosp_raven_61`. This change adds a common layer of inheritance for non-factory products (raven_generic.mk). This makes it easier to configure factory and non-factory products differently. Non-factory `raven` products now inherits from `device/google/raviole/raven_generic.mk` which inherit from `device/google/raviole/device-raven.mk`. aconfig flags: Flag: EXEMPT mechanical refactoring build flags: Flag: EXEMPT mechanical refactoring Bug: 338005353 Test: lunch aosp_raven-trunk_staging-userdebug && m lunch aosp_raven_64-trunk_staging-userdebug && m lunch aosp_raven_pkvm-trunk_staging-userdebug && m lunch aosp_raven_pgagnostic_64-trunk_staging-userdebug && m lunch aosp_raven_hwasan-trunk_staging-userdebug && m lunch aosp_raven_61-trunk_staging-userdebug && m Change-Id: Id5faed5a4be4c6480ee64654203d7f7e840c5c23 --- aosp_raven.mk | 2 +- raven_generic.mk | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 raven_generic.mk diff --git a/aosp_raven.mk b/aosp_raven.mk index 6a29283..f434886 100644 --- a/aosp_raven.mk +++ b/aosp_raven.mk @@ -15,7 +15,7 @@ # $(call inherit-product, device/google/gs101/aosp_common.mk) -$(call inherit-product, device/google/raviole/device-raven.mk) +$(call inherit-product, device/google/raviole/raven_generic.mk) PRODUCT_NAME := aosp_raven PRODUCT_NAME_FOR_ATTESTATION := raven diff --git a/raven_generic.mk b/raven_generic.mk new file mode 100644 index 0000000..abbac40 --- /dev/null +++ b/raven_generic.mk @@ -0,0 +1,17 @@ +# +# Copyright 2024 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, device/google/raviole/device-raven.mk) From 2dd9ebfb37909b82bcba0344a75a241ee537db47 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Fri, 3 May 2024 03:18:48 +0000 Subject: [PATCH 24/31] Convert slider/preloaded_nanoapps.json's .mk file to Android.bp. Since `preloaded_nanoapps.json` has different configurations for `factory` products and `non-factory` products, `soong_namespace {}` needs to be added to the converted Android.bp file to avoid misuse. Additionally, due to ag/27170565, ag/27170566, a common inheritance layer has been added to all `non-factory` products. Therefore, setting different `PRODUCT_SOONG_NAMESPACES` in the corresponding `_generic.mk` and `factory_.mk` files will allow factory products and non-factory products to use different preloaded_nanoapps.json. Bug: 338332183 Test: 1. lunch -trunk_staging-userdebug && \ m -j preloaded_nanoapps.json 2. Check ./out/target/product//.../preloaded_nanoapps.json It should be the version. 3. lunch factory_-trunk_staging-userdebug && \ m -j preloaded_nanoapps.json 4. Check ./out/target/product//.../preloaded_nanoapps.json It should be the factory version. Change-Id: I97798f0e7876ceb016a31f7da74508fe5a701915 --- factory_slider.mk | 3 +++ factory_whitefin.mk | 2 ++ slider_generic.mk | 3 +++ whitefin_generic.mk | 3 +++ 4 files changed, 11 insertions(+) diff --git a/factory_slider.mk b/factory_slider.mk index 1c51e91..1359fc6 100644 --- a/factory_slider.mk +++ b/factory_slider.mk @@ -23,3 +23,6 @@ PRODUCT_DEVICE := slider PRODUCT_MODEL := Factory build on Slider PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_whitefin.mk b/factory_whitefin.mk index 0dd0a4f..4d360c6 100644 --- a/factory_whitefin.mk +++ b/factory_whitefin.mk @@ -29,3 +29,5 @@ PRODUCT_MANUFACTURER := Google PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/slider_generic.mk b/slider_generic.mk index 52d2542..419e587 100644 --- a/slider_generic.mk +++ b/slider_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/raviole/device-slider.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider diff --git a/whitefin_generic.mk b/whitefin_generic.mk index a56c609..f0616c6 100644 --- a/whitefin_generic.mk +++ b/whitefin_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/raviole/device-whitefin.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider From 1413e4537ffa523db5c305f44928d5ebb81915ac Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Mon, 6 May 2024 02:19:37 +0000 Subject: [PATCH 25/31] Convert raven/preloaded_nanoapps.json's .mk file to Android.bp. Since `preloaded_nanoapps.json` has different configurations for `factory` products and `non-factory` products, `soong_namespace {}` needs to be added to the converted Android.bp file to avoid misuse. Additionally, due to ag/27170563, a common inheritance layer has been added to all `non-factory` products. Therefore, setting different `PRODUCT_SOONG_NAMESPACES` in the corresponding `_generic.mk` and `factory_.mk` files will allow factory products and non-factory products to use different preloaded_nanoapps.json. Bug: 338005353 Test: 1. lunch -trunk_staging-userdebug && \ m -j preloaded_nanoapps.json 2. Check ./out/target/product//.../preloaded_nanoapps.json It should be the version. 3. lunch factory_-trunk_staging-userdebug && \ m -j preloaded_nanoapps.json 4. Check ./out/target/product//.../preloaded_nanoapps.json It should be the factory version. Change-Id: Ie4551fc30c75a401a615a729e651949696117352 --- factory_raven.mk | 3 +++ raven_generic.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/factory_raven.mk b/factory_raven.mk index 48226c4..1b41a1c 100644 --- a/factory_raven.mk +++ b/factory_raven.mk @@ -32,3 +32,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_gn1_hat_tool fatp_imx586_hat_tool + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/raven_generic.mk b/raven_generic.mk index abbac40..6b16105 100644 --- a/raven_generic.mk +++ b/raven_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/raviole/device-raven.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/raven From ac3fb0c183314b5aead8ac2bf3118bf26484335f Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Mon, 6 May 2024 14:30:07 +0000 Subject: [PATCH 26/31] gps: Reduce logging mask Bug: 267729515 Bug: 312716075 Test: Verification for logging system. Test: Verification at b/267729515#comment152 Change-Id: I1f32da32f28c3e0f3cf9964485e6569eea5fa0c3 --- location/gps.xml | 2 +- location/gps.xml.oriole | 2 +- location/gps.xml.raven | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 52827b8..fb8dd62 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -68,7 +68,7 @@ Date: Wed, 1 May 2024 17:35:42 +0800 Subject: [PATCH 27/31] Update bootloader pdk folder and soong config Bug: 333834221 Change-Id: I7272b4b92575a12af8086d0d46d237f4f0674c2b --- oriole/BoardConfig.mk | 4 ++-- raven/BoardConfig.mk | 4 ++-- slider/BoardConfig.mk | 4 ++-- whitefin/BoardConfig.mk | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 5b13c0f..757ee50 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -25,9 +25,9 @@ BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index f47b104..06f97ae 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -25,9 +25,9 @@ BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)) ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 55a77a0..917b79a 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -15,9 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider -RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 560 USES_DEVICE_GOOGLE_RAVIOLE := true diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index 1bff3de..e28f7bf 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -15,9 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin -RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 440 USES_DEVICE_GOOGLE_RAVIOLE := true From 918e2cd8ec49b32e256c43ad7bab6a2a4dfe4f01 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 16 May 2024 18:30:54 +0000 Subject: [PATCH 28/31] Adpf:raviole: enable heuristic boost. Heuristic boost will adjust the ADPF boost profile when the powerhal detects the power session is very janky, providing more boost for deadline sensitive threads managed in the session. Bug: 341111433 Test: adb shell dumpsys android.hardware.power.IPower/default; check the device adpf sessions' traces. Change-Id: I850a5e9e2132c0f62097f41cc77e81d1ff6986f0 --- powerhint-oriole-mainline.json | 33 ++++++++++++++++++++++++++++++--- powerhint-oriole.json | 33 ++++++++++++++++++++++++++++++--- powerhint-raven-mainline.json | 33 ++++++++++++++++++++++++++++++--- powerhint-raven.json | 33 ++++++++++++++++++++++++++++++--- powerhint-slider.json | 33 ++++++++++++++++++++++++++++++--- powerhint-whitefin.json | 33 ++++++++++++++++++++++++++++++--- 6 files changed, 180 insertions(+), 18 deletions(-) diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json index e10d6a9..29dd8ab 100644 --- a/powerhint-oriole-mainline.json +++ b/powerhint-oriole-mainline.json @@ -1239,7 +1239,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, "TargetTimeFactor": 1, - "StaleTimeFactor": 15 + "StaleTimeFactor": 15, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1263,7 +1272,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, "TargetTimeFactor": 1, - "StaleTimeFactor": 15 + "StaleTimeFactor": 15, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1287,7 +1305,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1, - "StaleTimeFactor": 15 + "StaleTimeFactor": 15, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-oriole.json b/powerhint-oriole.json index e97fa3a..9264d09 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1756,7 +1756,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1781,7 +1790,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1806,7 +1824,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-raven-mainline.json b/powerhint-raven-mainline.json index f6d6ce1..a748e0e 100644 --- a/powerhint-raven-mainline.json +++ b/powerhint-raven-mainline.json @@ -1220,7 +1220,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, "TargetTimeFactor": 1, - "StaleTimeFactor": 15 + "StaleTimeFactor": 15, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1244,7 +1253,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, "TargetTimeFactor": 1, - "StaleTimeFactor": 15 + "StaleTimeFactor": 15, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1268,7 +1286,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1, - "StaleTimeFactor": 15 + "StaleTimeFactor": 15, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-raven.json b/powerhint-raven.json index 3872e3e..af6d3c7 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1737,7 +1737,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1762,7 +1771,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1787,7 +1805,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-slider.json b/powerhint-slider.json index a18eda1..98f770e 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -1511,7 +1511,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1536,7 +1545,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1561,7 +1579,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 20e65c9..a53293f 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -1478,7 +1478,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1503,7 +1512,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1528,7 +1546,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", From e9bd7abd978ddaa310841f05bb539ba4437d767e Mon Sep 17 00:00:00 2001 From: George Lee Date: Tue, 30 Apr 2024 03:35:39 +0000 Subject: [PATCH 29/31] thermal: Remove SOFT_OCP related tzones Bug: 337976702 Test: Confirm boot Change-Id: Idc23886c376c33a027f73e3f486e5d93eb1000b6 Signed-off-by: George Lee --- thermal_info_config_oriole.json | 32 ---------------- thermal_info_config_raven.json | 32 ---------------- thermal_info_config_slider.json | 64 ------------------------------- thermal_info_config_whitefin.json | 64 ------------------------------- 4 files changed, 192 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 372e851..ad24136 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -607,38 +607,6 @@ "Multiplier":1, "Hidden":true }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index c3289e2..6f3b0d0 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -597,38 +597,6 @@ "Multiplier":1, "Hidden":true }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json index f08cd9f..16c795c 100644 --- a/thermal_info_config_slider.json +++ b/thermal_info_config_slider.json @@ -257,70 +257,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json index f08cd9f..16c795c 100644 --- a/thermal_info_config_whitefin.json +++ b/thermal_info_config_whitefin.json @@ -257,70 +257,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU", From 9d415a88907e1e8c4a9230ec9587899baf747e09 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Sat, 27 Apr 2024 01:41:20 +0800 Subject: [PATCH 30/31] audio: remove unused device Bug: 337191827 Test: build pass Change-Id: Ic00b74be86816fa22ae401497fd68aad4c219c81 Signed-off-by: Carter Hsu --- audio/oriole/config/audio_policy_configuration.xml | 8 -------- .../audio_policy_configuration_a2dp_offload_disabled.xml | 8 -------- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 8 -------- .../audio_policy_configuration_le_offload_disabled.xml | 8 -------- audio/raven/config/audio_policy_configuration.xml | 8 -------- .../audio_policy_configuration_a2dp_offload_disabled.xml | 8 -------- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 8 -------- .../audio_policy_configuration_le_offload_disabled.xml | 8 -------- 8 files changed, 64 deletions(-) diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index b40204e..03a695e 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml index a55b5d1..ab9a002 100644 --- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml index 72748dd..2e898e5 100644 --- a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml index a55b5d1..ab9a002 100644 --- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml index 72748dd..2e898e5 100644 --- a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - Date: Tue, 28 May 2024 01:59:12 +0000 Subject: [PATCH 31/31] waves: correct config to fix wrong tuning - remove unused controls since the last version isn't expected multiple instance. Bug: 341323676 Test: manual test Change-Id: I69e5f4125044c3a56e8f44f5bace7cca3d06717b Signed-off-by: Jasmine Cha --- audio/oriole/tuning/waves/waves_config.ini | 3 --- audio/raven/tuning/waves/waves_config.ini | 3 --- 2 files changed, 6 deletions(-) diff --git a/audio/oriole/tuning/waves/waves_config.ini b/audio/oriole/tuning/waves/waves_config.ini index ba12a8e..f330db0 100644 --- a/audio/oriole/tuning/waves/waves_config.ini +++ b/audio/oriole/tuning/waves/waves_config.ini @@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER -HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## [HAL_SUPPORTED_CONTROLS] SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL -A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC -USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so diff --git a/audio/raven/tuning/waves/waves_config.ini b/audio/raven/tuning/waves/waves_config.ini index ba12a8e..f330db0 100644 --- a/audio/raven/tuning/waves/waves_config.ini +++ b/audio/raven/tuning/waves/waves_config.ini @@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER -HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## [HAL_SUPPORTED_CONTROLS] SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL -A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC -USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so