diff options
author | Xin Li <delphij@google.com> | 2024-03-06 09:29:49 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2024-03-06 09:29:49 -0800 |
commit | 7cd1a780ce05190ad25673b2eac483e3afbba663 (patch) | |
tree | 4546f78bae714cdf3fae698aa9b29b2f6495fc07 | |
parent | 9e58dbf4b23747ebf7987790db176cc5dd06574a (diff) | |
parent | f0b57b356ccc0b7b6a8072d71a87b34c2fd0edac (diff) | |
download | pantah-main.tar.gz |
Bug: 319669529
Merged-In: I7a726b0940a9d2877033a0aaf48f602572c39972
Change-Id: I4027b6b4f3b54cefe04b70e2fb3c72500500ed52
31 files changed, 1284 insertions, 188 deletions
@@ -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:master:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..37ebb5e --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Builtin Hooks] +jsonlint = true diff --git a/audio/cheetah/aidl_config/audio_platform_configuration.xml b/audio/cheetah/aidl_config/audio_platform_configuration.xml index a3144da..66fbad8 100644 --- a/audio/cheetah/aidl_config/audio_platform_configuration.xml +++ b/audio/cheetah/aidl_config/audio_platform_configuration.xml @@ -46,15 +46,7 @@ <devices> <device name="bluetooth" /> - <device name="usb"> - <argument name="MaxSamplingRate" value="192000" /> - <argument name="UnsupportedFormat" value="S24_LE" /> - <argument name="MaxCapPacketInterval" value="125" /> - <argument name="MaxCapSampleRate" value="192000" /> - <argument name="MaxCapBitWidth" value="32" /> - <argument name="MaxCapChannel" value="2" /> - <argument name="EnableHifi192kMultichannel" value="0" /> - </device> + <device name="usb" /> <device name="speaker" codec="cs35l41"> <argument name="SpeakerNum" value="2" /> <argument name="Rotation" /> diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml index bb9574b..6a766b1 100644 --- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml +++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml @@ -404,6 +404,14 @@ <path name="primary-playback -> bt" /> </path> + <path name="primary-playback-0 -> bluetooth-low-energy-headset"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-low-energy-speaker"> + <path name="primary-playback -> bt" /> + </path> + <path name="primary-playback-0 -> usb"> <ctl name="USB_RX Mixer EP2" value="1" /> </path> @@ -464,6 +472,14 @@ <path name="raw-playback -> bt" /> </path> + <path name="raw-playback-0 -> bluetooth-low-energy-headset"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-low-energy-speaker"> + <path name="raw-playback -> bt" /> + </path> + <path name="raw-playback-0 -> usb"> <ctl name="USB_RX Mixer RAW" value="1" /> </path> @@ -524,6 +540,14 @@ <path name="deep-buffer-playback -> bt" /> </path> + <path name="deep-buffer-playback-0 -> bluetooth-low-energy-headset"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-low-energy-speaker"> + <path name="deep-buffer-playback -> bt" /> + </path> + <path name="deep-buffer-playback-0 -> usb"> <ctl name="USB_RX Mixer EP6" value="1" /> </path> @@ -589,6 +613,14 @@ <path name="compress-offload-playback -> bt" /> </path> + <path name="compress-offload-playback-0 -> bluetooth-low-energy-headset"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-low-energy-speaker"> + <path name="compress-offload-playback -> bt" /> + </path> + <path name="compress-offload-playback-0 -> usb"> <ctl name="USB_RX Mixer EP7" value="1" /> </path> @@ -649,6 +681,14 @@ <path name="mmap-playback -> bt" /> </path> + <path name="mmap-playback-0 -> bluetooth-low-energy-headset"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-low-energy-speaker"> + <path name="mmap-playback -> bt" /> + </path> + <path name="mmap-playback-0 -> usb"> <ctl name="USB_RX Mixer EP1" value="1" /> </path> @@ -721,6 +761,14 @@ <path name="voip-playback -> bt" /> </path> + <path name="voip-playback-0 -> bluetooth-low-energy-headset"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-low-energy-speaker"> + <path name="voip-playback -> bt" /> + </path> + <path name="voip-playback-0 -> usb"> <ctl name="USB_RX Mixer VOIP" value="1" /> </path> @@ -831,6 +879,14 @@ <path name="haptic-playback -> bt" /> </path> + <path name="haptic-playback-0 -> bluetooth-low-energy-headset"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-low-energy-speaker"> + <path name="haptic-playback -> bt" /> + </path> + <path name="haptic-playback-0 -> usb"> <ctl name="USB_RX Mixer EP3" value="1" /> <ctl name="TDM_0_RX Mixer EP8" value="1" /> @@ -865,6 +921,14 @@ <path name="usb-microphones -> primary-capture-0" /> </path> + <path name="bluetooth-sco-headset-microphones -> primary-capture-0"> + <ctl name="EP1 TX Mixer BT_TX" value="1" /> + </path> + + <path name="bluetooth-low-energy-headset-microphones -> primary-capture-0"> + <ctl name="EP1 TX Mixer BT_TX" value="1" /> + </path> + <path name="microphones -> voip-capture-0"> <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" /> </path> @@ -889,6 +953,10 @@ <ctl name="VOIP TX Mixer BT_TX" value="1" /> </path> + <path name="bluetooth-low-energy-headset-microphones -> voip-capture-0"> + <ctl name="VOIP TX Mixer BT_TX" value="1" /> + </path> + <path name="microphones -> fast-capture-0"> <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> @@ -913,6 +981,10 @@ <ctl name="EP3 TX Mixer BT_TX" value="1" /> </path> + <path name="bluetooth-low-energy-headset-microphones -> fast-capture-0"> + <ctl name="EP3 TX Mixer BT_TX" value="1" /> + </path> + <path name="microphones -> sound-trigger-capture-0"> </path> @@ -947,6 +1019,14 @@ <path name="voice-call-downlink-0 -> bt" /> </path> + <path name="voice-call-downlink-0 -> bluetooth-low-energy-headset"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + + <path name="voice-call-downlink-0 -> bluetooth-low-energy-speaker"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + <path name="voice-call-downlink-0 -> usb"> <ctl name="USB_RX Mixer EP5" value="1" /> </path> @@ -987,6 +1067,10 @@ <ctl name="EP4 TX Mixer BT_TX" value="1" /> </path> + <path name="bluetooth-low-energy-headset-microphones -> voice-call-uplink-0"> + <ctl name="EP4 TX Mixer BT_TX" value="1" /> + </path> + <path name="null-source -> voice-call-uplink-0"> <ctl name="EP4 TX Mixer INCALL_TX" value="1" /> </path> @@ -1051,6 +1135,10 @@ <ctl name="EP2 TX Mixer BT_TX" value="1" /> </path> + <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0"> + <ctl name="EP2 TX Mixer BT_TX" value="1" /> + </path> + <!-- codec setting --> <!-- Rx device --> <path name="speaker-earpiece"> @@ -1220,6 +1308,10 @@ <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> + <path name="bluetooth-low-energy-headset-microphones"> + <path name="bluetooth-sco-headset-microphones" /> + </path> + <path name="usb-headset-microphones"> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" /> diff --git a/audio/panther/aidl_config/audio_platform_configuration.xml b/audio/panther/aidl_config/audio_platform_configuration.xml index a3144da..66fbad8 100644 --- a/audio/panther/aidl_config/audio_platform_configuration.xml +++ b/audio/panther/aidl_config/audio_platform_configuration.xml @@ -46,15 +46,7 @@ <devices> <device name="bluetooth" /> - <device name="usb"> - <argument name="MaxSamplingRate" value="192000" /> - <argument name="UnsupportedFormat" value="S24_LE" /> - <argument name="MaxCapPacketInterval" value="125" /> - <argument name="MaxCapSampleRate" value="192000" /> - <argument name="MaxCapBitWidth" value="32" /> - <argument name="MaxCapChannel" value="2" /> - <argument name="EnableHifi192kMultichannel" value="0" /> - </device> + <device name="usb" /> <device name="speaker" codec="cs35l41"> <argument name="SpeakerNum" value="2" /> <argument name="Rotation" /> diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml index bb9574b..6a766b1 100644 --- a/audio/panther/aidl_config/mixer_paths_aidl.xml +++ b/audio/panther/aidl_config/mixer_paths_aidl.xml @@ -404,6 +404,14 @@ <path name="primary-playback -> bt" /> </path> + <path name="primary-playback-0 -> bluetooth-low-energy-headset"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-low-energy-speaker"> + <path name="primary-playback -> bt" /> + </path> + <path name="primary-playback-0 -> usb"> <ctl name="USB_RX Mixer EP2" value="1" /> </path> @@ -464,6 +472,14 @@ <path name="raw-playback -> bt" /> </path> + <path name="raw-playback-0 -> bluetooth-low-energy-headset"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-low-energy-speaker"> + <path name="raw-playback -> bt" /> + </path> + <path name="raw-playback-0 -> usb"> <ctl name="USB_RX Mixer RAW" value="1" /> </path> @@ -524,6 +540,14 @@ <path name="deep-buffer-playback -> bt" /> </path> + <path name="deep-buffer-playback-0 -> bluetooth-low-energy-headset"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-low-energy-speaker"> + <path name="deep-buffer-playback -> bt" /> + </path> + <path name="deep-buffer-playback-0 -> usb"> <ctl name="USB_RX Mixer EP6" value="1" /> </path> @@ -589,6 +613,14 @@ <path name="compress-offload-playback -> bt" /> </path> + <path name="compress-offload-playback-0 -> bluetooth-low-energy-headset"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-low-energy-speaker"> + <path name="compress-offload-playback -> bt" /> + </path> + <path name="compress-offload-playback-0 -> usb"> <ctl name="USB_RX Mixer EP7" value="1" /> </path> @@ -649,6 +681,14 @@ <path name="mmap-playback -> bt" /> </path> + <path name="mmap-playback-0 -> bluetooth-low-energy-headset"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-low-energy-speaker"> + <path name="mmap-playback -> bt" /> + </path> + <path name="mmap-playback-0 -> usb"> <ctl name="USB_RX Mixer EP1" value="1" /> </path> @@ -721,6 +761,14 @@ <path name="voip-playback -> bt" /> </path> + <path name="voip-playback-0 -> bluetooth-low-energy-headset"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-low-energy-speaker"> + <path name="voip-playback -> bt" /> + </path> + <path name="voip-playback-0 -> usb"> <ctl name="USB_RX Mixer VOIP" value="1" /> </path> @@ -831,6 +879,14 @@ <path name="haptic-playback -> bt" /> </path> + <path name="haptic-playback-0 -> bluetooth-low-energy-headset"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-low-energy-speaker"> + <path name="haptic-playback -> bt" /> + </path> + <path name="haptic-playback-0 -> usb"> <ctl name="USB_RX Mixer EP3" value="1" /> <ctl name="TDM_0_RX Mixer EP8" value="1" /> @@ -865,6 +921,14 @@ <path name="usb-microphones -> primary-capture-0" /> </path> + <path name="bluetooth-sco-headset-microphones -> primary-capture-0"> + <ctl name="EP1 TX Mixer BT_TX" value="1" /> + </path> + + <path name="bluetooth-low-energy-headset-microphones -> primary-capture-0"> + <ctl name="EP1 TX Mixer BT_TX" value="1" /> + </path> + <path name="microphones -> voip-capture-0"> <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" /> </path> @@ -889,6 +953,10 @@ <ctl name="VOIP TX Mixer BT_TX" value="1" /> </path> + <path name="bluetooth-low-energy-headset-microphones -> voip-capture-0"> + <ctl name="VOIP TX Mixer BT_TX" value="1" /> + </path> + <path name="microphones -> fast-capture-0"> <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> @@ -913,6 +981,10 @@ <ctl name="EP3 TX Mixer BT_TX" value="1" /> </path> + <path name="bluetooth-low-energy-headset-microphones -> fast-capture-0"> + <ctl name="EP3 TX Mixer BT_TX" value="1" /> + </path> + <path name="microphones -> sound-trigger-capture-0"> </path> @@ -947,6 +1019,14 @@ <path name="voice-call-downlink-0 -> bt" /> </path> + <path name="voice-call-downlink-0 -> bluetooth-low-energy-headset"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + + <path name="voice-call-downlink-0 -> bluetooth-low-energy-speaker"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + <path name="voice-call-downlink-0 -> usb"> <ctl name="USB_RX Mixer EP5" value="1" /> </path> @@ -987,6 +1067,10 @@ <ctl name="EP4 TX Mixer BT_TX" value="1" /> </path> + <path name="bluetooth-low-energy-headset-microphones -> voice-call-uplink-0"> + <ctl name="EP4 TX Mixer BT_TX" value="1" /> + </path> + <path name="null-source -> voice-call-uplink-0"> <ctl name="EP4 TX Mixer INCALL_TX" value="1" /> </path> @@ -1051,6 +1135,10 @@ <ctl name="EP2 TX Mixer BT_TX" value="1" /> </path> + <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0"> + <ctl name="EP2 TX Mixer BT_TX" value="1" /> + </path> + <!-- codec setting --> <!-- Rx device --> <path name="speaker-earpiece"> @@ -1220,6 +1308,10 @@ <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> + <path name="bluetooth-low-energy-headset-microphones"> + <path name="bluetooth-sco-headset-microphones" /> + </path> + <path name="usb-headset-microphones"> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" /> diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml index 89d0de6..5853138 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -32,6 +32,9 @@ <scenario encode="OneChanMono_24_2" decode="invalid"/> <scenario encode="TwoChanStereo_24_2" decode="invalid"/> <scenario encode="OneChanStereo_24_2" decode="invalid"/> + <scenario encode="OneChanMono_48_2" decode="invalid"/> + <scenario encode="TwoChanStereo_48_2" decode="invalid"/> + <scenario encode="OneChanStereo_48_2" decode="invalid"/> <scenario encode="OneChanMono_48_4" decode="invalid"/> <scenario encode="TwoChanStereo_48_4" decode="invalid"/> <scenario encode="OneChanStereo_48_4" decode="invalid"/> @@ -57,6 +60,9 @@ <configuration name="OneChanMono_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/> <configuration name="TwoChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/> <configuration name="OneChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/> + <configuration name="OneChanMono_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/> + <configuration name="TwoChanStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/> + <configuration name="OneChanStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/> <configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/> <configuration name="TwoChanStereo_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/> <configuration name="OneChanMono_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/> @@ -68,6 +74,7 @@ <codecConfiguration name="LC3_16k_2" codec="LC3" samplingFrequency="16000" frameDurationUs="10000" octetsPerCodecFrame="40"/> <codecConfiguration name="LC3_24k_2" codec="LC3" samplingFrequency="24000" frameDurationUs="10000" octetsPerCodecFrame="60"/> <codecConfiguration name="LC3_32k_2" codec="LC3" samplingFrequency="32000" frameDurationUs="10000" octetsPerCodecFrame="80"/> + <codecConfiguration name="LC3_48k_2" codec="LC3" samplingFrequency="48000" frameDurationUs="10000" octetsPerCodecFrame="100"/> <codecConfiguration name="LC3_48k_4" codec="LC3" samplingFrequency="48000" frameDurationUs="10000" octetsPerCodecFrame="120"/> </codecConfigurationList> <strategyConfigurationList> diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 5880d5b..3cedf15 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -17,6 +17,15 @@ # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif + # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index e69540e..c2dcfa0 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,6 +15,13 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper +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 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true diff --git a/device-cheetah.mk b/device-cheetah.mk index 8f879ae..f8e82fa 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# Restrict the visibility of Android.bp files to improve build analysis time +$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) + TARGET_KERNEL_DIR ?= device/google/pantah-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers @@ -211,6 +214,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# LE Audio Unicast Allowlist +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.allow_list=SM-R510 + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool @@ -267,11 +274,18 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include device/google/gs101/fingerprint/udfps_common.mk +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk +endif +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include device/google/gs101/fingerprint/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif PRODUCT_PACKAGES += \ @@ -282,6 +296,13 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk +endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) @@ -306,7 +327,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=37 + ro.vendor.build.svn=44 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ @@ -342,7 +363,7 @@ PRODUCT_VENDOR_PROPERTIES += \ ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=0 \ + persist.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.214 \ ro.vendor.vibrator.hal.loc.coeff=2.7 \ persist.vendor.vibrator.hal.context.enable=false \ @@ -365,7 +386,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # RKPD PRODUCT_PRODUCT_PROPERTIES += \ - remote_provisioning.enable_rkpd=true \ remote_provisioning.hostname=remoteprovisioning.googleapis.com \ ##Audio Vendor property diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 145de08..5d30dee 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# Restrict the visibility of Android.bp files to improve build analysis time +$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) + TARGET_KERNEL_DIR ?= device/google/pantah-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers @@ -152,6 +155,13 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk +endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-panther.mk b/device-panther.mk index 07aa48b..c6f0794 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# Restrict the visibility of Android.bp files to improve build analysis time +$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) + TARGET_KERNEL_DIR ?= device/google/pantah-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers @@ -181,6 +184,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# LE Audio Unicast Allowlist +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.allow_list=SM-R510 + + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool @@ -246,11 +254,18 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include device/google/gs101/fingerprint/udfps_common.mk +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk +endif +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include device/google/gs101/fingerprint/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # Display @@ -265,6 +280,13 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk +endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) @@ -289,7 +311,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=37 + ro.vendor.build.svn=44 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ @@ -327,7 +349,7 @@ PRODUCT_VENDOR_PROPERTIES += \ ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=0 \ + persist.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.195 \ ro.vendor.vibrator.hal.loc.coeff=2.65 \ persist.vendor.vibrator.hal.context.enable=false \ @@ -348,7 +370,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # RKPD PRODUCT_PRODUCT_PROPERTIES += \ - remote_provisioning.enable_rkpd=true \ remote_provisioning.hostname=remoteprovisioning.googleapis.com \ ##Audio Vendor property diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 0f3af6d..2dcc35c 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# Restrict the visibility of Android.bp files to improve build analysis time +$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) + TARGET_KERNEL_DIR ?= device/google/pantah-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers @@ -142,11 +145,18 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty -include device/google/gs101/fingerprint/udfps_common.mk +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk +endif +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include device/google/gs101/fingerprint/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # WiFi Overlay @@ -158,6 +168,13 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk +endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/location/gps.xml b/location/gps.xml index 3e9b0df..4dd4ceb 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index 26a55f7..f603aa9 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index 0215c9e..92376f0 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml b/location/gps_user.xml index d85da72..d64ba54 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index 1a369a6..6a15fe9 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index c1e5d59..839aed3 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index d8b7444..81f4438 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -20,6 +20,15 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif + ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 665c384..0f8c182 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -49,6 +49,16 @@ "ResetOnInit": true }, { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ @@ -81,6 +91,16 @@ "ResetOnInit": true }, { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", "Values": [ @@ -115,6 +135,16 @@ "ResetOnInit": true }, { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", "Values": [ @@ -148,6 +178,16 @@ "ResetOnInit": true }, { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Values": [ @@ -159,7 +199,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -168,7 +208,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1", @@ -178,7 +218,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -187,7 +227,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -206,7 +246,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -255,7 +295,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -264,7 +304,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -273,7 +313,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -283,7 +323,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -646,12 +686,6 @@ }, { "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, - { - "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", "Duration": 5000, "Value": "9999999" @@ -670,6 +704,48 @@ }, { "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, "Value": "765" @@ -932,6 +1008,18 @@ "Value": "664000" }, { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, + { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", "Duration": 3000, @@ -1749,6 +1837,36 @@ "Value": "572000" }, { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "PMU_POLL", "Duration": 0, diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 618d59a..101b43e 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -62,6 +62,16 @@ "ResetOnInit": true }, { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ @@ -94,6 +104,16 @@ "ResetOnInit": true }, { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", "Values": [ @@ -128,6 +148,16 @@ "ResetOnInit": true }, { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "GPUDvfsPeriod", "Path": "/sys/devices/platform/28000000.mali/dvfs_period", "Values": [ @@ -166,6 +196,16 @@ "ResetOnInit": true }, { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Values": [ @@ -177,7 +217,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -186,7 +226,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1" @@ -195,7 +235,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -204,7 +244,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -223,7 +263,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -272,7 +312,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -281,7 +321,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -290,7 +330,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -300,7 +340,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -322,7 +362,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "DisplayWakeup", @@ -647,7 +687,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" @@ -695,12 +735,6 @@ }, { "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, - { - "PowerHint": "LAUNCH", "Type": "DoHint", "Value": "LAUNCH_GPU" }, @@ -724,6 +758,48 @@ }, { "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, "Value": "765" @@ -781,6 +857,71 @@ "Value": "0" }, { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, + { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUMinFreq", "Duration": 50, @@ -991,6 +1132,18 @@ "Value": "664000" }, { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, + { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", "Duration": 3000, @@ -1904,6 +2057,36 @@ "Value": "572000" }, { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", "Duration": 0, diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 68d5c41..6d10711 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -42,6 +42,16 @@ "ResetOnInit": true }, { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ @@ -65,6 +75,16 @@ "ResetOnInit": true }, { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", "Values": [ @@ -87,6 +107,16 @@ "ResetOnInit": true }, { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", "Values": [ @@ -120,6 +150,16 @@ "ResetOnInit": true }, { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Values": [ @@ -130,7 +170,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "0", "692", @@ -144,7 +184,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -153,7 +193,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -198,7 +238,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -207,7 +247,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -216,7 +256,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "0", "1" @@ -225,7 +265,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -414,6 +454,48 @@ }, { "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, "Value": "692" @@ -1093,6 +1175,36 @@ "Value": "572000" }, { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", "Duration": 1000, diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 478619f..5a89a89 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -48,6 +48,16 @@ "ResetOnInit": true }, { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ @@ -76,6 +86,16 @@ "ResetOnInit": true }, { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", "Values": [ @@ -104,6 +124,16 @@ "ResetOnInit": true }, { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", "Values": [ @@ -137,6 +167,16 @@ "ResetOnInit": true }, { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Values": [ @@ -148,7 +188,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -157,7 +197,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1", @@ -167,7 +207,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -176,7 +216,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -195,7 +235,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -244,7 +284,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -253,7 +293,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -262,7 +302,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -272,7 +312,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -635,12 +675,6 @@ }, { "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, - { - "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", "Duration": 5000, "Value": "9999999" @@ -659,6 +693,48 @@ }, { "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, "Value": "765" @@ -921,6 +997,18 @@ "Value": "664000" }, { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, + { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", "Duration": 3000, @@ -1636,6 +1724,36 @@ "Value": "572000" }, { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "PMU_POLL", "Duration": 0, diff --git a/powerhint-panther.json b/powerhint-panther.json index 849ef07..a067b1a 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -61,6 +61,16 @@ "ResetOnInit": true }, { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ @@ -89,6 +99,16 @@ "ResetOnInit": true }, { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", "Values": [ @@ -117,6 +137,16 @@ "ResetOnInit": true }, { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", "Values": [ @@ -146,6 +176,16 @@ "ResetOnInit": true }, { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Values": [ @@ -157,7 +197,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -166,7 +206,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1" @@ -175,7 +215,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -184,7 +224,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -203,7 +243,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -252,7 +292,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -261,7 +301,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -270,7 +310,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -280,7 +320,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -302,7 +342,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "DisplayWakeup", @@ -627,7 +667,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" @@ -669,12 +709,6 @@ }, { "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, - { - "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", "Duration": 5000, "Value": "9999999" @@ -693,6 +727,48 @@ }, { "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, "Value": "765" @@ -750,6 +826,60 @@ "Value": "0" }, { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, + { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUMinFreq", "Duration": 50, @@ -960,6 +1090,18 @@ "Value": "664000" }, { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, + { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", "Duration": 3000, @@ -1771,6 +1913,36 @@ "Value": "572000" }, { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", "Duration": 0, diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index d1148b1..d01f39c 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -42,6 +42,16 @@ "ResetOnInit": true }, { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", "Values": [ @@ -65,6 +75,16 @@ "ResetOnInit": true }, { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", "Values": [ @@ -87,6 +107,16 @@ "ResetOnInit": true }, { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", "Values": [ @@ -120,6 +150,16 @@ "ResetOnInit": true }, { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Values": [ @@ -130,7 +170,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "0", "692", @@ -144,7 +184,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -153,7 +193,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -198,7 +238,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -207,7 +247,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -216,7 +256,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "0", "1" @@ -225,7 +265,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -414,6 +454,48 @@ }, { "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, "Value": "692" @@ -1093,6 +1175,36 @@ "Value": "572000" }, { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", "Duration": 1000, diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index caa2afc..8fc4e6a 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,6 +15,13 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw +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 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif TARGET_SCREEN_DENSITY := 560 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true diff --git a/thermal_info_config_charge_cheetah.json b/thermal_info_config_charge_cheetah.json index 95724da..ca7e17a 100644 --- a/thermal_info_config_charge_cheetah.json +++ b/thermal_info_config_charge_cheetah.json @@ -46,26 +46,27 @@ "Combination":["qi_therm","quiet_therm"], "Coefficient":[0.35, 0.65], "Offset":-650, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1383 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.21, 0.21, 0.21, 0.43, 0.43, 0.43, 0.43] } ], "BindedCdevInfo": [ @@ -74,8 +75,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, diff --git a/thermal_info_config_charge_panther.json b/thermal_info_config_charge_panther.json index b4be800..7ab7626 100644 --- a/thermal_info_config_charge_panther.json +++ b/thermal_info_config_charge_panther.json @@ -46,26 +46,27 @@ "Combination":["qi_therm", "quiet_therm"], "Coefficient":[0.282, 0.718], "Offset":-448, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1300, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2300, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 7600, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1300 }, "ExcludedPowerInfo": [ { - "PowerRail": "POWER_FOR_CHARGING_THROTTLING", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4] } ], "BindedCdevInfo": [ @@ -74,8 +75,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, @@ -182,7 +183,7 @@ "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 6ef7ea7..aeba547 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -143,8 +143,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -159,8 +159,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -214,8 +214,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -280,26 +280,27 @@ "Combination":["qi_therm","quiet_therm"], "Coefficient":[0.35, 0.65], "Offset":-650, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1383 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.21, 0.21, 0.21, 0.43, 0.43, 0.43, 0.43] } ], "BindedCdevInfo": [ @@ -308,8 +309,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index f0abf68..553b33e 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -143,8 +143,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -159,8 +159,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -214,8 +214,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -280,26 +280,27 @@ "Combination":["qi_therm", "quiet_therm"], "Coefficient":[0.282, 0.718], "Offset":-448, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1300, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2300, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 7600, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1300 }, "ExcludedPowerInfo": [ { - "PowerRail": "POWER_FOR_CHARGING_THROTTLING", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4] } ], "BindedCdevInfo": [ @@ -308,8 +309,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, @@ -319,8 +320,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, @@ -826,7 +827,7 @@ "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], |