diff --git a/OWNERS b/OWNERS index e434a1c..f5be82c 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS diff --git a/audio/cheetah/config/audio_policy_configuration.xml b/audio/cheetah/config/audio_policy_configuration.xml index ffcfc7f..dde76b6 100644 --- a/audio/cheetah/config/audio_policy_configuration.xml +++ b/audio/cheetah/config/audio_policy_configuration.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - diff --git a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml index efd85b1..db23991 100644 --- a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml index 833ba9e..6df42f7 100644 --- a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - diff --git a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml index efd85b1..db23991 100644 --- a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml index 833ba9e..6df42f7 100644 --- a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - 3 + + true + diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index c5f39fe..d923b44 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,12 +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% AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) endif TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true diff --git a/device-cheetah.mk b/device-cheetah.mk index 8a17047..895dd8f 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -17,18 +17,10 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CHEETAH_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cheetah.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) @@ -232,6 +224,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510 +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool @@ -288,13 +284,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(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)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -310,13 +299,6 @@ 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% AP3%,$(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))) @@ -341,7 +323,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=53 + ro.vendor.build.svn=58 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ @@ -374,6 +356,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true # Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 7e59c5c..723d350 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -17,8 +17,9 @@ # 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 +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cloudripper.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) @@ -155,13 +156,6 @@ 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% AP3%,$(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))) @@ -188,3 +182,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) diff --git a/device-panther.mk b/device-panther.mk index 1ddb441..2ba1948 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -17,18 +17,10 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -ifdef RELEASE_GOOGLE_PANTHER_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_PANTHER_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_PANTHER_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_PANTHER_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-panther.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) @@ -202,6 +194,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510 +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ @@ -268,13 +263,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(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)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -294,13 +282,6 @@ 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% AP3%,$(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))) @@ -325,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=53 + ro.vendor.build.svn=58 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ @@ -360,6 +341,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true # Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 324bfde..19f0afc 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -17,8 +17,9 @@ # 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 +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-ravenclaw.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) @@ -145,13 +146,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(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)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -168,13 +162,6 @@ 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% AP3%,$(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 c17d9b6..cda0fd0 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -70,7 +70,7 @@ 3 + + true + diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index d312541..a6bcdf0 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -933,7 +933,7 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 2500, - "Value": "1197000" + "Value": "1663000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -2117,6 +2117,8 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2124,7 +2126,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2141,6 +2152,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2148,7 +2161,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2165,6 +2187,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2172,7 +2196,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", @@ -2192,6 +2225,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2216,6 +2251,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2240,6 +2277,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index e24e207..8dac037 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -1057,7 +1057,7 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 2500, - "Value": "1197000" + "Value": "1663000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -2311,16 +2311,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2335,16 +2346,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2359,16 +2381,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", @@ -2388,9 +2421,9 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2412,9 +2445,9 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2436,9 +2469,9 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 6d10711..856de7a 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -1231,16 +1231,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1255,16 +1266,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1279,16 +1301,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", @@ -1308,9 +1341,9 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1332,9 +1365,9 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1356,9 +1389,9 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index c975a07..de5ee4e 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -922,7 +922,7 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 2500, - "Value": "1197000" + "Value": "1663000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -2004,6 +2004,8 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2011,7 +2013,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2028,6 +2039,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2035,7 +2048,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2052,6 +2074,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2059,7 +2083,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", @@ -2079,6 +2112,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2103,6 +2138,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2127,6 +2164,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, diff --git a/powerhint-panther.json b/powerhint-panther.json index 3fe7143..e87a278 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -1015,7 +1015,7 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 2500, - "Value": "1197000" + "Value": "1663000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -2167,16 +2167,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2191,16 +2202,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2215,16 +2237,27 @@ "PID_Du": 0.0, "UclampMin_On": true, "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", @@ -2244,9 +2277,9 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2268,9 +2301,9 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2292,9 +2325,9 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index d01f39c..269bd21 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -1233,6 +1233,8 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1240,7 +1242,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1257,6 +1268,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1264,7 +1277,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1281,6 +1303,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1288,7 +1312,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", @@ -1308,6 +1341,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1332,6 +1367,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1356,6 +1393,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index 1c21a93..0ead4dc 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,12 +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% AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) endif TARGET_SCREEN_DENSITY := 560 BOARD_USES_GENERIC_AUDIO := true diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index aeba547..e649bc6 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -715,36 +715,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1 - }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1 - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1 - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true } ], "CoolingDevices":[ diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json index a597fac..aed1512 100644 --- a/thermal_info_config_cloudripper.json +++ b/thermal_info_config_cloudripper.json @@ -437,102 +437,6 @@ "VrThreshold":"NAN", "Multiplier":1 }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 553b33e..d89803f 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -716,36 +716,6 @@ "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1 - }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1 - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1 - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true } ], "CoolingDevices":[ diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json index 26e5dbd..327f033 100644 --- a/thermal_info_config_ravenclaw.json +++ b/thermal_info_config_ravenclaw.json @@ -639,102 +639,6 @@ "VrThreshold":"NAN", "Multiplier":1 }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, { "Name":"TPU", "Type":"NPU",