From 73026c07480104d1539b38776151bfb001da84e1 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 7 Apr 2023 23:10:35 +0000 Subject: [PATCH 01/20] Add POWER_EFFICIENCY uclamp max to adpf config Add the "UclampMax_EfficientBase" value to the ADPF config in the powerhint.json to specify efficient core scheduling in the static case, and "UclampMax_EfficientOffset" for the dynamic case, for this device. Bug: 277285195 Test: manual Change-Id: I40f4d41e089aef21bcf1b762376e07670dcbc4f5 --- powerhint.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/powerhint.json b/powerhint.json index 95fcd73..44b76f1 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1753,6 +1753,8 @@ "UclampMin_Init": 182, "UclampMin_High": 514, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1780,6 +1782,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1804,6 +1808,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1828,6 +1834,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, From 5d8bcc3d52a7b8756c47dc2ef2616e409e8e08f8 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 21 Mar 2024 18:20:04 +0800 Subject: [PATCH 02/20] Branch bootloader prebuilts for 24Q3 release Bug: 326002225 Change-Id: I5f17634c1bce1f5d184b50092a5c419c66e8f449 --- device-tangorpro.mk | 4 +++- tangorpro/BoardConfig.mk | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 5b694ff..1f65d87 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -179,8 +179,10 @@ include device/google/tangorpro/fingerprint_config.mk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk endif diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index ec39627..65b2efb 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -17,8 +17,10 @@ TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := tangorpro 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 AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif From 9f5df0bbf9edd888f25fb03431c583397324edf1 Mon Sep 17 00:00:00 2001 From: vincenttew Date: Wed, 27 Mar 2024 11:29:41 +0800 Subject: [PATCH 03/20] audio: remove non-supported analog headset Bug: 329470379 Change-Id: If6b2560bca230e7c6a3132696761edc0e3030329 Signed-off-by: vincenttew --- audio/tangorpro/config/audio_policy_configuration.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index 7378357..e7cba13 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -136,10 +136,6 @@ - - - - @@ -161,8 +157,6 @@ - - Date: Tue, 2 Apr 2024 19:26:04 +0000 Subject: [PATCH 04/20] Switch Tangorpro to use v/g_d/r/phones/tangorpro/release_config_map.mk Bug: 332548096 Test: Build & Flash Change-Id: I2954c7a3f2ccb739e7954333da122ed4204c3eb2 --- device-tangorpro.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 1f65d87..cb8af32 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -14,6 +14,8 @@ # limitations under the License. # +PRODUCT_RELEASE_CONFIG_MAPS += vendor/google_devices/release/phones/tangorpro/release_config_map.mk + TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION From c68f4c88c773d20a28e1ebce709a4e5f9012a16c Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Thu, 14 Mar 2024 16:04:00 +0000 Subject: [PATCH 05/20] powerhint: set uclampmin_init value for applying CPU Load boost Bug: 329483662 Test: Manual Test Change-Id: I37c7c084e286d8ab544ef20a723974838af4d6c8 --- powerhint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerhint.json b/powerhint.json index 45d5de6..3dfa974 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1880,7 +1880,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 182, + "UclampMin_Init": 514, "UclampMin_High": 514, "UclampMin_Low": 2, "SamplingWindow_P": 1, From 75ce8fadefb8d2204020e2705b76d0bdbe7fbb76 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 3 Apr 2024 17:07:30 +0000 Subject: [PATCH 06/20] Revert "Switch Tangorpro to use v/g_d/r/phones/tangorpro/release_config_map.mk" This reverts commit c35512774f19b8e60d7b8a6b59bba01bacd6e7c7. Reason for revert: breaks *-without-vendor build (release config is under vendor/ tree) Change-Id: I608deff25ab5a68f9b1443899f3382dabb8afa9f --- device-tangorpro.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index cb8af32..1f65d87 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -14,8 +14,6 @@ # limitations under the License. # -PRODUCT_RELEASE_CONFIG_MAPS += vendor/google_devices/release/phones/tangorpro/release_config_map.mk - TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION From 2e7c13a9b5888b83518a77d3674ea02c30fcee68 Mon Sep 17 00:00:00 2001 From: Poompatai Puntitpong Date: Mon, 8 Apr 2024 14:07:34 +0000 Subject: [PATCH 07/20] Revert "BT: set system property for Bluetooth Auto On" Revert submission 26454366-bton-tablets Reason for revert: It causes power usage bump and lower user satisfaction Reverted changes: /q/submissionid:26454366-bton-tablets Change-Id: Iabc1aac3829909df31292e2b15fa183febf7a741 --- device-tangorpro.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 145bb45..6a0436f 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -132,10 +132,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true -# Enable Bluetooth AutoOn feature -PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=true - # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service From b50b9cde68aa4718eb3826d4fbfc608601a6cb16 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 10 Apr 2024 07:09:34 +0000 Subject: [PATCH 08/20] powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values Bug: 329483662 Test: Manual Test Change-Id: I8c90fe98ccc19e88596eb506876edf1b66132a7b --- powerhint.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/powerhint.json b/powerhint.json index 3dfa974..114d76b 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1880,15 +1880,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 514, + "UclampMin_Init": 182, + "UclampMin_LoadUp": 514, + "UclampMin_LoadReset": 514, "UclampMin_High": 514, "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 }, @@ -1911,8 +1911,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1935,8 +1933,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1959,8 +1955,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } From 870addb6bc944ea2a5ebb0452e027da87b73adf8 Mon Sep 17 00:00:00 2001 From: Mina Granic Date: Mon, 11 Mar 2024 10:17:53 +0000 Subject: [PATCH 09/20] Enable landscape_to_portrait camera feed rotate-and-crop for Tangor. Bug: 332496523 Test: manual Change-Id: I7db652d48201b931413ac1428850d1b64090e2e4 --- device-tangorpro.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index d464da7..1262782 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -287,7 +287,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.adjust_backend_min_freq_for_1p_front_video_1080p_30fps=1 \ persist.vendor.camera.bypass_sensor_binning_resolution_condition=1 \ persist.vendor.camera.extended_launch_boost=1 \ - persist.vendor.camera.raise_buf_allocation_priority=1 + persist.vendor.camera.raise_buf_allocation_priority=1 \ + camera.enable_landscape_to_portrait=true # Enable camera exif model/make reporting PRODUCT_VENDOR_PROPERTIES += \ From 034f842e8426106dc692a72eaf8029c6d7c8a4de Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:47:35 +0800 Subject: [PATCH 10/20] Switch kernel directory to control by build flag Bug: 309749142 Change-Id: I76bf00c8009ceaf70a26dc837e75f1c574f4f75f --- device-tangorpro.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 1f65d87..074c0db 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -16,18 +16,10 @@ TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT -ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_TANGORPRO_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/tangorpro-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TANGORPRO_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TANGORPRO_DIR)/kernel-headers BOARD_WITHOUT_RADIO := true From afc9f7b790d0ade3eaf1972236f32ce2f29ebce2 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Wed, 17 Apr 2024 04:12:54 +0000 Subject: [PATCH 11/20] [USB Audio AIDL] Add mixer path for "usb-device-microphones" Bug: 329147872 Test: Local test Change-Id: I0759333c2fe51c334e0d64681e75551f9239c614 --- audio/tangorpro/aidl_config/mixer_paths_aidl.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml index d89f751..e15a243 100644 --- a/audio/tangorpro/aidl_config/mixer_paths_aidl.xml +++ b/audio/tangorpro/aidl_config/mixer_paths_aidl.xml @@ -1410,7 +1410,7 @@ - + @@ -1420,6 +1420,14 @@ + + + + + + + + From d3ebe379f9c484092aad1697b536ab47c5157892 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 18 Apr 2024 16:04:10 +0800 Subject: [PATCH 12/20] Switch bootloader directory to control by build flag Bug: 333834221 Change-Id: I503fbd2495390284958280bda7dad7b80395d9b7 --- device-tangorpro.mk | 9 --------- tangorpro/BoardConfig.mk | 12 +++--------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 074c0db..4efbb1d 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -169,15 +169,6 @@ include device/google/tangorpro/fingerprint_config.mk # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk -endif # Wifi SAP Interface Name PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index 65b2efb..fad104f 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -15,15 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := tangorpro -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 AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR)) # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true From c3da58cd2a3ee7bd7857de7454628145ba34c745 Mon Sep 17 00:00:00 2001 From: Thomas Girardier Date: Thu, 25 Apr 2024 16:19:02 +0000 Subject: [PATCH 13/20] Revert^2 "BT: set system property for Bluetooth Auto On" 2e7c13a9b5888b83518a77d3674ea02c30fcee68 Change-Id: Ibae2fb2e4e14dc07eefb7b78b647608f5845b3f1 --- device-tangorpro.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 6a0436f..145bb45 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -132,6 +132,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true +# Enable Bluetooth AutoOn feature +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.server.automatic_turn_on=true + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service From c4b8f8b97704ce92638d9267ef0dede17917be99 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Sat, 27 Apr 2024 02:00:39 +0800 Subject: [PATCH 14/20] audio: remove unused device Bug: 337191827 Test: build pass Change-Id: Iddcd4b9faa7b491974db36f1de79821d37fc2528 Signed-off-by: Carter Hsu --- audio/tangorpro/config/audio_policy_configuration.xml | 2 -- .../audio_policy_configuration_a2dp_offload_disabled.xml | 8 -------- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 8 -------- 3 files changed, 18 deletions(-) diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index e7cba13..2d1b259 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -148,8 +148,6 @@ - - diff --git a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml index 56dce30..6ecf25b 100644 --- a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -136,10 +136,6 @@ - - - - @@ -152,8 +148,6 @@ - - @@ -161,8 +155,6 @@ - - diff --git a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 47b581c..a510290 100644 --- a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -132,10 +132,6 @@ - - - - @@ -146,8 +142,6 @@ - - @@ -155,8 +149,6 @@ - - From 8cb1da499cf96ee6753e4450675d847b31858157 Mon Sep 17 00:00:00 2001 From: Qian-Hao Huang Date: Thu, 2 May 2024 21:10:16 +0800 Subject: [PATCH 15/20] Load fips140.ko before all other kernel modules Bug: 337838109 Bug: 331791671 Change-Id: I3928032b7c5d1eb2595722ca165181172b9535d2 Signed-off-by: Qian-Hao Huang --- tangorpro/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index fad104f..b265ee6 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -23,6 +23,7 @@ $(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TANG 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_drm.load_sequential=1 ifdef PHONE_CAR_BOARD_PRODUCT From 1df894ba9a48562c609bcf923e49f6b292c18824 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 1 May 2024 18:43:35 +0800 Subject: [PATCH 16/20] Update bootloader pdk folder and soong config Bug: 333834221 Change-Id: I9b0a749ffcb996c82eb79a5759c1465f38780704 --- tangorpro/BoardConfig.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index fad104f..1f4b9ad 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -15,9 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := tangorpro -RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR ?= pdk # Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR)) +$(call soong_config_set,tangorpro_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TANGORPRO_DIR)) # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true From 4a90451745c7baa3af63cdcab8e80480c3b5f833 Mon Sep 17 00:00:00 2001 From: samou Date: Wed, 15 May 2024 11:53:59 +0000 Subject: [PATCH 17/20] thermal: Remove SOFT_OCP related tzones Bug: 337976702 Test: Confirm boot Change-Id: If2bf94b3d673b7bd5c7a6367b6eb969af38dba72 Signed-off-by: samou --- thermal_info_config_tangorpro.json | 32 ------------------------------ 1 file changed, 32 deletions(-) diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json index 1aa4981..5260a34 100644 --- a/thermal_info_config_tangorpro.json +++ b/thermal_info_config_tangorpro.json @@ -630,38 +630,6 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "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", 8000, "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 } ], "CoolingDevices":[ From 8c4dea2fa880f14489a7c4b63f25524497673e50 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 16 May 2024 20:42:28 +0000 Subject: [PATCH 18/20] Adpf:tangorpro: 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 managered in the session. Bug: 341111433 Test: adb shell dumpsys android.hardware.power.IPower/default; Check the device adpf sessions' traces. Change-Id: I4f4d79ed9e169fba6de0eea0e5356fef0bf7e388 --- powerhint.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/powerhint.json b/powerhint.json index bdd91f3..79e1c35 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1892,7 +1892,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", From 6602d509b394e1ef13c3405e0a3c400834d0d3ed Mon Sep 17 00:00:00 2001 From: Hyungwoo Yang Date: Thu, 16 May 2024 08:52:16 +0000 Subject: [PATCH 19/20] Add USI stylus input configuration file This is to support the Google USI Subsystem. Bug: 337984471 Change-Id: If2f935239047028ac70cc2451ec8369248659b95 --- USI_Stylus.idc | 4 ++++ device-tangorpro.mk | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 USI_Stylus.idc diff --git a/USI_Stylus.idc b/USI_Stylus.idc new file mode 100644 index 0000000..58d8d2c --- /dev/null +++ b/USI_Stylus.idc @@ -0,0 +1,4 @@ +touch.orientationAware = 1 +touch.orientation = ORIENTATION_0 +touch.usiVersionMajor = 2 +touch.usiVersionMinor = 0 diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 57dd148..3e95329 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -71,7 +71,8 @@ PRODUCT_DEXPREOPT_SPEED_APPS += SystemUITitan # For tablet # Touch files PRODUCT_COPY_FILES += \ device/google/tangorpro/NVTCapacitiveTouchScreen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitiveTouchScreen.idc \ - device/google/tangorpro/NVTCapacitivePen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitivePen.idc + device/google/tangorpro/NVTCapacitivePen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitivePen.idc \ + device/google/tangorpro/USI_Stylus.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/USI_Stylus.idc # Init files PRODUCT_COPY_FILES += \ From 231936b1b3918345c7eaf603aeb3fd5b310e9b92 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 29 May 2024 10:00:48 +0000 Subject: [PATCH 20/20] Switch makefile owners to MK_OWNERS Bug: 278167548 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:060a2e65f6976227591588b69114c8488f21077b) Merged-In: Icedf5981c6a9cd5d08ca9591de8960948dbeb1b3 Change-Id: Icedf5981c6a9cd5d08ca9591de8960948dbeb1b3 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 7eed0c3..5524a1f 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +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:main:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS