From 334963ba49932ae2691bf218cf1372fe1362f54a Mon Sep 17 00:00:00 2001 From: weichinweng Date: Mon, 29 Jan 2024 03:00:04 +0000 Subject: [PATCH 1/8] Add BT offload config into bt_vendo_overlay bug: 287672291 bug: 323464810 Test: BT off/on when BT CHRE enabled/disabled Change-Id: Ie8b635874eaade02c683f37618f7e83a9fb7ba1c --- bluetooth/bt_vendor_overlay.conf | 15 +++++++++++---- bluetooth/bt_vendor_overlay_caiman.conf | 14 ++++++++++++-- bluetooth/bt_vendor_overlay_komodo.conf | 14 ++++++++++++-- bluetooth/bt_vendor_overlay_ripcurrent24.conf | 14 ++++++++++++-- bluetooth/bt_vendor_overlay_ripcurrentpro.conf | 14 ++++++++++++-- bluetooth/bt_vendor_overlay_tokay.conf | 14 ++++++++++++-- 6 files changed, 71 insertions(+), 14 deletions(-) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index 4f922230..13df7510 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -3,11 +3,18 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -# UserialType = 2 +# Priority of uart type +# HciUartSocket = 0 +# SerialUartPort = 1 +# SerialAocUartPort = 2 +# UserialInvalid = 3 +UserialTypePriority = 2-1 -# Enable check whether let aoc controls power pin -AocPowerPinCtrlCheckEnable = true +# The hardware support which offload capability +BtOffloadCap = AOC + +# The BT Offload Trunk Flag Group Name +BtOffloadTrunkGroup = 24P_AOC # Sar backOff high resolution support SarBackOffHighResolution = true diff --git a/bluetooth/bt_vendor_overlay_caiman.conf b/bluetooth/bt_vendor_overlay_caiman.conf index a5b39f78..d2bb0806 100644 --- a/bluetooth/bt_vendor_overlay_caiman.conf +++ b/bluetooth/bt_vendor_overlay_caiman.conf @@ -3,8 +3,18 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -# UserialType = 2 +# Priority of uart type +# HciUartSocket = 0 +# SerialUartPort = 1 +# SerialAocUartPort = 2 +# UserialInvalid = 3 +UserialTypePriority = 2-1 + +# The hardware support which offload capability +BtOffloadCap = AOC + +# The BT Offload Trunk Flag Group Name +BtOffloadTrunkGroup = 24P_AOC # Sar backOff high resolution support SarBackOffHighResolution = true diff --git a/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf index a5b39f78..d2bb0806 100644 --- a/bluetooth/bt_vendor_overlay_komodo.conf +++ b/bluetooth/bt_vendor_overlay_komodo.conf @@ -3,8 +3,18 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -# UserialType = 2 +# Priority of uart type +# HciUartSocket = 0 +# SerialUartPort = 1 +# SerialAocUartPort = 2 +# UserialInvalid = 3 +UserialTypePriority = 2-1 + +# The hardware support which offload capability +BtOffloadCap = AOC + +# The BT Offload Trunk Flag Group Name +BtOffloadTrunkGroup = 24P_AOC # Sar backOff high resolution support SarBackOffHighResolution = true diff --git a/bluetooth/bt_vendor_overlay_ripcurrent24.conf b/bluetooth/bt_vendor_overlay_ripcurrent24.conf index 19388fc7..8789e499 100644 --- a/bluetooth/bt_vendor_overlay_ripcurrent24.conf +++ b/bluetooth/bt_vendor_overlay_ripcurrent24.conf @@ -3,8 +3,18 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -# UserialType = 2 +# Priority of uart type +# HciUartSocket = 0 +# SerialUartPort = 1 +# SerialAocUartPort = 2 +# UserialInvalid = 3 +UserialTypePriority = 2-1 + +# The hardware support which offload capability +BtOffloadCap = AOC + +# The BT Offload Trunk Flag Group Name +BtOffloadTrunkGroup = 24P_AOC # Sar backOff high resolution support SarBackOffHighResolution = true diff --git a/bluetooth/bt_vendor_overlay_ripcurrentpro.conf b/bluetooth/bt_vendor_overlay_ripcurrentpro.conf index 19388fc7..8789e499 100644 --- a/bluetooth/bt_vendor_overlay_ripcurrentpro.conf +++ b/bluetooth/bt_vendor_overlay_ripcurrentpro.conf @@ -3,8 +3,18 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -# UserialType = 2 +# Priority of uart type +# HciUartSocket = 0 +# SerialUartPort = 1 +# SerialAocUartPort = 2 +# UserialInvalid = 3 +UserialTypePriority = 2-1 + +# The hardware support which offload capability +BtOffloadCap = AOC + +# The BT Offload Trunk Flag Group Name +BtOffloadTrunkGroup = 24P_AOC # Sar backOff high resolution support SarBackOffHighResolution = true diff --git a/bluetooth/bt_vendor_overlay_tokay.conf b/bluetooth/bt_vendor_overlay_tokay.conf index a5b39f78..d2bb0806 100644 --- a/bluetooth/bt_vendor_overlay_tokay.conf +++ b/bluetooth/bt_vendor_overlay_tokay.conf @@ -3,8 +3,18 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -# UserialType = 2 +# Priority of uart type +# HciUartSocket = 0 +# SerialUartPort = 1 +# SerialAocUartPort = 2 +# UserialInvalid = 3 +UserialTypePriority = 2-1 + +# The hardware support which offload capability +BtOffloadCap = AOC + +# The BT Offload Trunk Flag Group Name +BtOffloadTrunkGroup = 24P_AOC # Sar backOff high resolution support SarBackOffHighResolution = true From 64becd453f5c2aea14c391db6d3de01704003789 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Wed, 6 Mar 2024 05:52:00 +0000 Subject: [PATCH 2/8] caimito: add sound-trigger-microphones Test: end-to-end and host test. Bug: 328340282 Change-Id: Ib4adac74b0ffd1dd05a6368e447f21978d1f6d99 --- audio/caiman/aidl_config/mixer_paths_aidl.xml | 16 +++++++--------- audio/komodo/aidl_config/mixer_paths_aidl.xml | 16 +++++++--------- audio/tokay/aidl_config/mixer_paths_aidl.xml | 16 +++++++--------- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml index d637938a..638fb6a4 100644 --- a/audio/caiman/aidl_config/mixer_paths_aidl.xml +++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml @@ -1087,11 +1087,15 @@ - + - + + + + + - + @@ -1334,12 +1338,6 @@ - - - - - - diff --git a/audio/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml index d637938a..638fb6a4 100644 --- a/audio/komodo/aidl_config/mixer_paths_aidl.xml +++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml @@ -1087,11 +1087,15 @@ - + - + + + + + - + @@ -1334,12 +1338,6 @@ - - - - - - diff --git a/audio/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml index d637938a..638fb6a4 100644 --- a/audio/tokay/aidl_config/mixer_paths_aidl.xml +++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml @@ -1087,11 +1087,15 @@ - + - + + + + + - + @@ -1334,12 +1338,6 @@ - - - - - - From f3002822e8f8897ca421f6e1452166ac7e1741d8 Mon Sep 17 00:00:00 2001 From: Sam Paradis Date: Thu, 1 Feb 2024 01:20:25 +0000 Subject: [PATCH 3/8] Change FACE_UNLOCK_BOOST to Maximize CPU Frequency This is part of an optimization that limits the length and prevelance of this power hint. Strict, ultra-agression minimizes power and latency versus always-on mid aggression. Bug: 297964952 Change-Id: I71cb6ea9296126d576029196da87e5e76ef3ea4c --- perf/powerhint-caiman.json | 16 +++++----------- perf/powerhint-komodo.json | 16 +++++----------- perf/powerhint-ripcurrent24.json | 18 ++++++------------ perf/powerhint-ripcurrentpro.json | 16 +++++----------- perf/powerhint-tokay.json | 16 +++++----------- perf/powerhint-zuma.json | 16 +++++----------- 6 files changed, 31 insertions(+), 67 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 8c8ce94a..b9e5b079 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -2759,25 +2759,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 9cd2eeca..10ca93f6 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -2759,25 +2759,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/perf/powerhint-ripcurrent24.json b/perf/powerhint-ripcurrent24.json index d4a31f20..8879c7e2 100644 --- a/perf/powerhint-ripcurrent24.json +++ b/perf/powerhint-ripcurrent24.json @@ -2162,25 +2162,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { @@ -2193,7 +2187,7 @@ "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMinFreq", "Duration": 1000, - "Value": "9999999" + "Value": "1852000" }, { "PowerHint": "FP_BOOST", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 9cd2eeca..10ca93f6 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -2759,25 +2759,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 9cd2eeca..10ca93f6 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -2759,25 +2759,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1885000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/perf/powerhint-zuma.json b/perf/powerhint-zuma.json index 0b5b35a7..caaf935d 100644 --- a/perf/powerhint-zuma.json +++ b/perf/powerhint-zuma.json @@ -2618,25 +2618,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1852000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { From 65c3514e3a9ea71cda313f759cb533608157c39c Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Fri, 8 Mar 2024 08:29:20 +0800 Subject: [PATCH 4/8] audio: remove the HIDL SoundDose from AIDL Bug: 328014856 Test: atest vts_treble_vintf_vendor_test, and confirmed no android_hardware_audio_sounddose_ISoundDoseFactory_default_V2_5 error Change-Id: I62bac2610c81dc24a9a60166f0e5ec3bafa7297f Signed-off-by: Carter Hsu --- device-caiman.mk | 6 ++++-- device-komodo.mk | 6 ++++-- device-tokay.mk | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index d4f58e64..c8fcdc9e 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -137,10 +137,12 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.stereo_spatialization_enabled=true -# Sound Dose +ifneq ($(USE_AUDIO_HAL_AIDL),true) +# HIDL Sound Dose PRODUCT_PACKAGES += \ android.hardware.audio.sounddose-vendor-impl \ - audio_sounddose_aoc \ + audio_sounddose_aoc +endif # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-komodo.mk b/device-komodo.mk index e361cc72..3a4d18d2 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -156,10 +156,12 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.stereo_spatialization_enabled=true -# Sound Dose +ifneq ($(USE_AUDIO_HAL_AIDL),true) +# HIDL Sound Dose PRODUCT_PACKAGES += \ android.hardware.audio.sounddose-vendor-impl \ - audio_sounddose_aoc \ + audio_sounddose_aoc +endif # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-tokay.mk b/device-tokay.mk index 842ddd34..e0299caf 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -130,10 +130,12 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.stereo_spatialization_enabled=true -# Sound Dose +ifneq ($(USE_AUDIO_HAL_AIDL),true) +# HIDL Sound Dose PRODUCT_PACKAGES += \ android.hardware.audio.sounddose-vendor-impl \ - audio_sounddose_aoc \ + audio_sounddose_aoc +endif # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ From 308b3165787d38f7abf9a10ffb1c1b70031158c5 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Mon, 26 Feb 2024 06:25:00 +0000 Subject: [PATCH 5/8] gps: update gps makefile Test: on-device Bug: 326527903 Change-Id: Ib4c9e9251e3d3dbb5b7bdfc24477cdc2e106a5e0 --- device-caiman.mk | 1 - device-komodo.mk | 1 - device-ripcurrent24.mk | 1 - device-ripcurrentpro.mk | 1 - device-tokay.mk | 1 - 5 files changed, 5 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 61086098..d442769c 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -245,7 +245,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/caiman $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) diff --git a/device-komodo.mk b/device-komodo.mk index a5f91002..43d0a18b 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -264,7 +264,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/komodo $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index 37d67c53..a7b09bed 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -203,7 +203,6 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrent24 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index ee3becc2..858b377a 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -205,7 +205,6 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrentpro $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) diff --git a/device-tokay.mk b/device-tokay.mk index cbccdd76..e7e9c474 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -234,7 +234,6 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) From 26da57220906dd258a4bac1f7de8fff761ae460f Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Tue, 12 Mar 2024 08:24:38 +0800 Subject: [PATCH 6/8] gps: update GPS configurations Bug: 326437941 Bug: 326031975 Test: verify config pass Change-Id: I6ea22569642816ea0dbce82be1a6ca4317bb38cc --- location/caiman/user/gps.cfg | 6 +++--- location/caiman/userdebug/gps.cfg | 6 +++--- location/komodo/user/gps.cfg | 6 +++--- location/komodo/userdebug/gps.cfg | 6 +++--- location/ripcurrent24/user/gps.cfg | 6 +++--- location/ripcurrent24/userdebug/gps.cfg | 6 +++--- location/ripcurrentpro/user/gps.cfg | 6 +++--- location/ripcurrentpro/userdebug/gps.cfg | 6 +++--- location/tokay/user/gps.cfg | 6 +++--- location/tokay/userdebug/gps.cfg | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 5ae4c794..2e696551 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -28,8 +28,8 @@ bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -61,7 +61,7 @@ RfPathLossDb_L5_Ap=4450 RfPathLossDb_L5_Cp=4450 IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_ID=0 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 504e5630..9adc95bb 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -115,8 +115,8 @@ navicUsedInUSPolicy=2 # DVS: 0 = Disabled, 1 = Enabled (default) # DFS: 0 = Disabled, 1 = Enabled (default) -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -193,7 +193,7 @@ IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN # DEFAULT diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index b69c90cd..5e7bbcdb 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -28,8 +28,8 @@ bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -61,7 +61,7 @@ RfPathLossDb_L5_Ap=3700 RfPathLossDb_L5_Cp=3700 IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_ID=0 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index 12f9dcf7..38b0e085 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -115,8 +115,8 @@ navicUsedInUSPolicy=2 # DVS: 0 = Disabled, 1 = Enabled (default) # DFS: 0 = Disabled, 1 = Enabled (default) -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -193,7 +193,7 @@ IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN # DEFAULT diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 8db3e38a..a310e64e 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -26,8 +26,8 @@ bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -55,7 +55,7 @@ SpotLogger_Allowed=0 soft_dog=0 IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_ID=0 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 2eda32f9..ae105425 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -111,8 +111,8 @@ navicUsedInUSPolicy=2 # DVS: 0 = Disabled, 1 = Enabled (default) # DFS: 0 = Disabled, 1 = Enabled (default) -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -185,7 +185,7 @@ IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN # DEFAULT diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 8db3e38a..a310e64e 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -26,8 +26,8 @@ bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -55,7 +55,7 @@ SpotLogger_Allowed=0 soft_dog=0 IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_ID=0 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 2eda32f9..ae105425 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -111,8 +111,8 @@ navicUsedInUSPolicy=2 # DVS: 0 = Disabled, 1 = Enabled (default) # DFS: 0 = Disabled, 1 = Enabled (default) -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -185,7 +185,7 @@ IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN # DEFAULT diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 9de51e21..be84a55e 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -28,8 +28,8 @@ bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -61,7 +61,7 @@ RfPathLossDb_L5_Ap=3870 RfPathLossDb_L5_Cp=3870 IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_ID=0 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 1b5f22a7..f084608f 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -115,8 +115,8 @@ navicUsedInUSPolicy=2 # DVS: 0 = Disabled, 1 = Enabled (default) # DFS: 0 = Disabled, 1 = Enabled (default) -Chip_Configuration_FeatureCfg_DVS = 0 -Chip_Configuration_FeatureCfg_DFS = 0 +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -193,7 +193,7 @@ IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 # 0: Use calibrated Accel data 1: Use uncalibrated Accel data -isUseUncalAccel=0 +isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN # DEFAULT From 5f65d099f05995a87aeda72ee94bc1a1629f5352 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Tue, 23 Jan 2024 11:19:39 -0800 Subject: [PATCH 7/8] powerhint: port dvfs_headroom settings from p23 Bug: 322000346 Test: boot Change-Id: I04cbd92a905135664059b338710993250566c9a7 Signed-off-by: Yvonne Yip --- perf/powerhint-caiman.json | 46 +++++++++++++--------------- perf/powerhint-komodo.json | 50 ++++++++++++++----------------- perf/powerhint-ripcurrentpro.json | 50 ++++++++++++++----------------- perf/powerhint-tokay.json | 50 ++++++++++++++----------------- 4 files changed, 86 insertions(+), 110 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index b9e5b079..6698e62a 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -230,9 +230,9 @@ "Values": [ "1280", "1100", - "1280 1100 1055" + "1100 1078 1024" ], - "DefaultIndex": 0, + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -1851,13 +1851,13 @@ }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUUtilThreshold", + "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUDVFSHeadroom", + "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1100" }, @@ -1933,6 +1933,12 @@ "Duration": 0, "Value": "700000" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -2005,18 +2011,6 @@ "Duration": 0, "Value": "cam2" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUUtilThreshold", - "Duration": 0, - "Value": "1100 1024 1100" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1280 1100 1055" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -2077,6 +2071,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -2253,13 +2253,13 @@ }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUUtilThreshold", + "Node": "CPUDVFSHeadroom", "Duration": 0, "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUDVFSHeadroom", + "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1100" }, @@ -2600,12 +2600,6 @@ "Duration": 0, "Value": "game" }, - { - "PowerHint": "GAME", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1100" - }, { "PowerHint": "GAME", "Node": "CPUTaperedDVFSHeadroomEnable", @@ -2972,7 +2966,7 @@ "Name": "REFRESH_120FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.6, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 10ca93f6..6698e62a 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -213,7 +213,7 @@ ], "ResetOnInit": true }, - { + { "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ @@ -230,9 +230,9 @@ "Values": [ "1280", "1100", - "1280 1100 1055" + "1100 1078 1024" ], - "DefaultIndex": 0, + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -1213,7 +1213,7 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, - { + { "PowerHint": "DISPLAY_INACTIVE", "Node": "TAPreferIdle", "Duration": 0, @@ -1851,13 +1851,13 @@ }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUUtilThreshold", + "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUDVFSHeadroom", + "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1100" }, @@ -1933,6 +1933,12 @@ "Duration": 0, "Value": "700000" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -2005,18 +2011,6 @@ "Duration": 0, "Value": "cam2" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUUtilThreshold", - "Duration": 0, - "Value": "1100 1024 1100" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1280 1100 1055" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -2077,6 +2071,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -2253,13 +2253,13 @@ }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUUtilThreshold", + "Node": "CPUDVFSHeadroom", "Duration": 0, "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUDVFSHeadroom", + "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1100" }, @@ -2600,12 +2600,6 @@ "Duration": 0, "Value": "game" }, - { - "PowerHint": "GAME", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1100" - }, { "PowerHint": "GAME", "Node": "CPUTaperedDVFSHeadroomEnable", @@ -2972,7 +2966,7 @@ "Name": "REFRESH_120FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.6, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 10ca93f6..6698e62a 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -213,7 +213,7 @@ ], "ResetOnInit": true }, - { + { "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ @@ -230,9 +230,9 @@ "Values": [ "1280", "1100", - "1280 1100 1055" + "1100 1078 1024" ], - "DefaultIndex": 0, + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -1213,7 +1213,7 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, - { + { "PowerHint": "DISPLAY_INACTIVE", "Node": "TAPreferIdle", "Duration": 0, @@ -1851,13 +1851,13 @@ }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUUtilThreshold", + "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUDVFSHeadroom", + "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1100" }, @@ -1933,6 +1933,12 @@ "Duration": 0, "Value": "700000" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -2005,18 +2011,6 @@ "Duration": 0, "Value": "cam2" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUUtilThreshold", - "Duration": 0, - "Value": "1100 1024 1100" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1280 1100 1055" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -2077,6 +2071,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -2253,13 +2253,13 @@ }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUUtilThreshold", + "Node": "CPUDVFSHeadroom", "Duration": 0, "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUDVFSHeadroom", + "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1100" }, @@ -2600,12 +2600,6 @@ "Duration": 0, "Value": "game" }, - { - "PowerHint": "GAME", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1100" - }, { "PowerHint": "GAME", "Node": "CPUTaperedDVFSHeadroomEnable", @@ -2972,7 +2966,7 @@ "Name": "REFRESH_120FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.6, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 10ca93f6..6698e62a 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -213,7 +213,7 @@ ], "ResetOnInit": true }, - { + { "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ @@ -230,9 +230,9 @@ "Values": [ "1280", "1100", - "1280 1100 1055" + "1100 1078 1024" ], - "DefaultIndex": 0, + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -1213,7 +1213,7 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, - { + { "PowerHint": "DISPLAY_INACTIVE", "Node": "TAPreferIdle", "Duration": 0, @@ -1851,13 +1851,13 @@ }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUUtilThreshold", + "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUDVFSHeadroom", + "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1100" }, @@ -1933,6 +1933,12 @@ "Duration": 0, "Value": "700000" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -2005,18 +2011,6 @@ "Duration": 0, "Value": "cam2" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUUtilThreshold", - "Duration": 0, - "Value": "1100 1024 1100" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1280 1100 1055" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -2077,6 +2071,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -2253,13 +2253,13 @@ }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUUtilThreshold", + "Node": "CPUDVFSHeadroom", "Duration": 0, "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUDVFSHeadroom", + "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1100" }, @@ -2600,12 +2600,6 @@ "Duration": 0, "Value": "game" }, - { - "PowerHint": "GAME", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1100" - }, { "PowerHint": "GAME", "Node": "CPUTaperedDVFSHeadroomEnable", @@ -2972,7 +2966,7 @@ "Name": "REFRESH_120FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.6, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, From 62221287956f6123e6bfe761de37ff1f3cb058c6 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Tue, 12 Mar 2024 07:47:57 -0700 Subject: [PATCH 8/8] powerhint: port migration margin settings from p23 Bug: 316035859 Test: boot Change-Id: I75a13076c9e388cb1628c80035d3f4f7a0905718 --- perf/powerhint-caiman.json | 17 +++++++++++++++-- perf/powerhint-komodo.json | 17 +++++++++++++++-- perf/powerhint-ripcurrentpro.json | 17 +++++++++++++++-- perf/powerhint-tokay.json | 17 +++++++++++++++-- 4 files changed, 60 insertions(+), 8 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 6698e62a..edc1a5e1 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -217,9 +217,10 @@ "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ + "2048 1280 1280", "1280", "1100", - "1100 1024 1100" + "1100 1078 1024" ], "DefaultIndex": 0, "ResetOnInit": true @@ -1859,7 +1860,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2011,6 +2012,12 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -2083,6 +2090,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 6698e62a..edc1a5e1 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -217,9 +217,10 @@ "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ + "2048 1280 1280", "1280", "1100", - "1100 1024 1100" + "1100 1078 1024" ], "DefaultIndex": 0, "ResetOnInit": true @@ -1859,7 +1860,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2011,6 +2012,12 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -2083,6 +2090,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 6698e62a..edc1a5e1 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -217,9 +217,10 @@ "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ + "2048 1280 1280", "1280", "1100", - "1100 1024 1100" + "1100 1078 1024" ], "DefaultIndex": 0, "ResetOnInit": true @@ -1859,7 +1860,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2011,6 +2012,12 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -2083,6 +2090,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 6698e62a..edc1a5e1 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -217,9 +217,10 @@ "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ + "2048 1280 1280", "1280", "1100", - "1100 1024 1100" + "1100 1078 1024" ], "DefaultIndex": 0, "ResetOnInit": true @@ -1859,7 +1860,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2011,6 +2012,12 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -2083,6 +2090,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap",