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 @@
-
-
-
-
-
-
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
diff --git a/device-caiman.mk b/device-caiman.mk
index a6933a71..83622352 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 += \
@@ -245,7 +247,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 2475fd00..3631a8be 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 += \
@@ -264,7 +266,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 0be4fe60..9b8e5bca 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 += \
@@ -234,7 +236,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))
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
diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index 8c8ce94a..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
@@ -230,9 +231,9 @@
"Values": [
"1280",
"1100",
- "1280 1100 1055"
+ "1100 1078 1024"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -1851,15 +1852,15 @@
},
{
"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"
+ "Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1933,6 +1934,12 @@
"Duration": 0,
"Value": "700000"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@@ -2009,13 +2016,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
- "Value": "1100 1024 1100"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CPUDVFSHeadroom",
- "Duration": 0,
- "Value": "1280 1100 1055"
+ "Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2077,12 +2078,24 @@
"Duration": 0,
"Value": "camera"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUUtilThreshold",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
@@ -2253,13 +2266,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 +2613,6 @@
"Duration": 0,
"Value": "game"
},
- {
- "PowerHint": "GAME",
- "Node": "CPUDVFSHeadroom",
- "Duration": 0,
- "Value": "1100"
- },
{
"PowerHint": "GAME",
"Node": "CPUTaperedDVFSHeadroomEnable",
@@ -2759,25 +2766,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"
},
{
@@ -2978,7 +2979,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 9cd2eeca..edc1a5e1 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -213,13 +213,14 @@
],
"ResetOnInit": true
},
- {
+ {
"Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold",
"Values": [
+ "2048 1280 1280",
"1280",
"1100",
- "1100 1024 1100"
+ "1100 1078 1024"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -230,9 +231,9 @@
"Values": [
"1280",
"1100",
- "1280 1100 1055"
+ "1100 1078 1024"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -1213,7 +1214,7 @@
"Type": "EndHint",
"Value": "DISPLAY_UPDATE_IMMINENT"
},
- {
+ {
"PowerHint": "DISPLAY_INACTIVE",
"Node": "TAPreferIdle",
"Duration": 0,
@@ -1851,15 +1852,15 @@
},
{
"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"
+ "Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1933,6 +1934,12 @@
"Duration": 0,
"Value": "700000"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@@ -2009,13 +2016,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
- "Value": "1100 1024 1100"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CPUDVFSHeadroom",
- "Duration": 0,
- "Value": "1280 1100 1055"
+ "Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2077,12 +2078,24 @@
"Duration": 0,
"Value": "camera"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUUtilThreshold",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
@@ -2253,13 +2266,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 +2613,6 @@
"Duration": 0,
"Value": "game"
},
- {
- "PowerHint": "GAME",
- "Node": "CPUDVFSHeadroom",
- "Duration": 0,
- "Value": "1100"
- },
{
"PowerHint": "GAME",
"Node": "CPUTaperedDVFSHeadroomEnable",
@@ -2759,25 +2766,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"
},
{
@@ -2978,7 +2979,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-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..edc1a5e1 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -213,13 +213,14 @@
],
"ResetOnInit": true
},
- {
+ {
"Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold",
"Values": [
+ "2048 1280 1280",
"1280",
"1100",
- "1100 1024 1100"
+ "1100 1078 1024"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -230,9 +231,9 @@
"Values": [
"1280",
"1100",
- "1280 1100 1055"
+ "1100 1078 1024"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -1213,7 +1214,7 @@
"Type": "EndHint",
"Value": "DISPLAY_UPDATE_IMMINENT"
},
- {
+ {
"PowerHint": "DISPLAY_INACTIVE",
"Node": "TAPreferIdle",
"Duration": 0,
@@ -1851,15 +1852,15 @@
},
{
"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"
+ "Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1933,6 +1934,12 @@
"Duration": 0,
"Value": "700000"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@@ -2009,13 +2016,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
- "Value": "1100 1024 1100"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CPUDVFSHeadroom",
- "Duration": 0,
- "Value": "1280 1100 1055"
+ "Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2077,12 +2078,24 @@
"Duration": 0,
"Value": "camera"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUUtilThreshold",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
@@ -2253,13 +2266,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 +2613,6 @@
"Duration": 0,
"Value": "game"
},
- {
- "PowerHint": "GAME",
- "Node": "CPUDVFSHeadroom",
- "Duration": 0,
- "Value": "1100"
- },
{
"PowerHint": "GAME",
"Node": "CPUTaperedDVFSHeadroomEnable",
@@ -2759,25 +2766,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"
},
{
@@ -2978,7 +2979,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 9cd2eeca..edc1a5e1 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -213,13 +213,14 @@
],
"ResetOnInit": true
},
- {
+ {
"Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold",
"Values": [
+ "2048 1280 1280",
"1280",
"1100",
- "1100 1024 1100"
+ "1100 1078 1024"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -230,9 +231,9 @@
"Values": [
"1280",
"1100",
- "1280 1100 1055"
+ "1100 1078 1024"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -1213,7 +1214,7 @@
"Type": "EndHint",
"Value": "DISPLAY_UPDATE_IMMINENT"
},
- {
+ {
"PowerHint": "DISPLAY_INACTIVE",
"Node": "TAPreferIdle",
"Duration": 0,
@@ -1851,15 +1852,15 @@
},
{
"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"
+ "Value": "1100 1078 1024"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1933,6 +1934,12 @@
"Duration": 0,
"Value": "700000"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@@ -2009,13 +2016,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
- "Value": "1100 1024 1100"
- },
- {
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "CPUDVFSHeadroom",
- "Duration": 0,
- "Value": "1280 1100 1055"
+ "Value": "1280"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2077,12 +2078,24 @@
"Duration": 0,
"Value": "camera"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
"Value": "1"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "CPUUtilThreshold",
+ "Duration": 0,
+ "Value": "1280"
+ },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap",
@@ -2253,13 +2266,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 +2613,6 @@
"Duration": 0,
"Value": "game"
},
- {
- "PowerHint": "GAME",
- "Node": "CPUDVFSHeadroom",
- "Duration": 0,
- "Value": "1100"
- },
{
"PowerHint": "GAME",
"Node": "CPUTaperedDVFSHeadroomEnable",
@@ -2759,25 +2766,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"
},
{
@@ -2978,7 +2979,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-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"
},
{