diff --git a/aosp_husky.mk b/aosp_husky.mk index 47cf99b..6cd4ada 100644 --- a/aosp_husky.mk +++ b/aosp_husky.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := husky PRODUCT_MODEL := AOSP on husky PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/shusky/manifest.xml diff --git a/aosp_ripcurrent.mk b/aosp_ripcurrent.mk index 4a6c484..2576e6d 100644 --- a/aosp_ripcurrent.mk +++ b/aosp_ripcurrent.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := ripcurrent PRODUCT_MODEL := AOSP on ripcurrent PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/shusky/manifest.xml diff --git a/aosp_shiba.mk b/aosp_shiba.mk index f9ec72f..1b6cfd4 100644 --- a/aosp_shiba.mk +++ b/aosp_shiba.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := shiba PRODUCT_MODEL := AOSP on shiba PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/shusky/manifest.xml diff --git a/audio/husky/prebuilt/libspeechenhancer/Android.bp b/audio/husky/prebuilt/libspeechenhancer/Android.bp new file mode 100644 index 0000000..9d4a232 --- /dev/null +++ b/audio/husky/prebuilt/libspeechenhancer/Android.bp @@ -0,0 +1,43 @@ +// Copyright (C) 2024 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +soong_namespace { +} + +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +cc_prebuilt_library_shared { + name: "libspeechenhancer", + vendor: true, + owner: "google", + proprietary: true, + allow_undefined_symbols: true, + arch: { + arm64: { + srcs: ["arm64/libspeechenhancer.so"], + }, + }, + + shared_libs: [ + "libcutils", + "libEGL", + "libGLESv2", + "libbinder_ndk", + "liblog", + "libsync", + "libz", + "libnativewindow", + ], +} diff --git a/audio/husky/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/husky/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so new file mode 100644 index 0000000..861ef15 Binary files /dev/null and b/audio/husky/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ diff --git a/audio/shiba/prebuilt/libspeechenhancer/Android.bp b/audio/shiba/prebuilt/libspeechenhancer/Android.bp new file mode 100644 index 0000000..9d4a232 --- /dev/null +++ b/audio/shiba/prebuilt/libspeechenhancer/Android.bp @@ -0,0 +1,43 @@ +// Copyright (C) 2024 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +soong_namespace { +} + +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +cc_prebuilt_library_shared { + name: "libspeechenhancer", + vendor: true, + owner: "google", + proprietary: true, + allow_undefined_symbols: true, + arch: { + arm64: { + srcs: ["arm64/libspeechenhancer.so"], + }, + }, + + shared_libs: [ + "libcutils", + "libEGL", + "libGLESv2", + "libbinder_ndk", + "liblog", + "libsync", + "libz", + "libnativewindow", + ], +} diff --git a/audio/shiba/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/shiba/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so new file mode 100644 index 0000000..861ef15 Binary files /dev/null and b/audio/shiba/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index 172d66d..61f136b 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -35,10 +35,12 @@ SarBackOffHighResolution = true # Update BQR Event Mask property value # TODO: remove this bqr event mask setting after Alpha exit -BqrEventMaskValueUpdate = 295006 +BqrEventMaskValueUpdate = 295262 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus BtOpusEnabled = true BtHalRecoveryByRestart = true + +KernelRxWakelockTimeInMilliseconds = 300 diff --git a/conf/init.husky.rc b/conf/init.husky.rc index 3479e7c..ef43021 100644 --- a/conf/init.husky.rc +++ b/conf/init.husky.rc @@ -68,6 +68,7 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/default/num_waves chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset + chown system system /sys/bus/i2c/devices/0-0043/default/owt_lib_compat chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index @@ -75,13 +76,6 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_env_rel_coef - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_rise_headroom - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_fall_headroom - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_enable - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_thresh_fs - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_hold_off_ms - chown system system /sys/bus/i2c/devices/0-0043/default/pm_active_timeout_ms enable vendor.vibrator.cs40l26 diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc index f19c3e2..f2d7793 100644 --- a/conf/init.shiba.rc +++ b/conf/init.shiba.rc @@ -68,16 +68,10 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/0-0043/default/owt_lib_compat chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_env_rel_coef - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_rise_headroom - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_fall_headroom - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_enable - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_thresh_fs - chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_hold_off_ms - chown system system /sys/bus/i2c/devices/0-0043/default/pm_active_timeout_ms enable vendor.vibrator.cs40l26 diff --git a/device-husky.mk b/device-husky.mk index d1bd5e7..2f064b2 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -162,6 +162,13 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# HdMic Audio +PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/husky/prebuilt/libspeechenhancer +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.app.audio.gsenet.version=1 +PRODUCT_PACKAGES += \ + libspeechenhancer + # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false @@ -194,13 +201,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.event_mask=295262 \ persist.bluetooth.bqr.vnd_quality_mask=29 \ persist.bluetooth.bqr.vnd_trace_mask=0 \ persist.bluetooth.vendor.btsnoop=true else PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.event_mask=295262 \ persist.bluetooth.bqr.vnd_quality_mask=16 \ persist.bluetooth.bqr.vnd_trace_mask=0 \ persist.bluetooth.vendor.btsnoop=false @@ -227,8 +234,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.profile.bap.broadcast.assist.enabled=true \ - bluetooth.profile.bap.broadcast.source.enabled=true + bluetooth.profile.bap.broadcast.assist.enabled?=true \ + bluetooth.profile.bap.broadcast.source.enabled?=true # Bluetooth LE Audio enable hardware offloading PRODUCT_PRODUCT_PROPERTIES += \ @@ -252,6 +259,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Disable Bluetooth HAP by default +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.profile.hap.enabled_by_default=false + # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.ble.allow_enc_with_bredr=true @@ -298,6 +309,7 @@ PRODUCT_SOONG_NAMESPACES += \ # WiFi Overlay PRODUCT_PACKAGES += \ UwbOverlayHK3 \ + UwbOverlayHK3Gsi \ WifiOverlay2023 \ PixelWifiOverlay2023 diff --git a/device-shiba.mk b/device-shiba.mk index aa28f12..e08e7a1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -150,6 +150,13 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# HdMic Audio +PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/shiba/prebuilt/libspeechenhancer +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.app.audio.gsenet.version=1 +PRODUCT_PACKAGES += \ + libspeechenhancer + # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false @@ -182,13 +189,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.event_mask=295262 \ persist.bluetooth.bqr.vnd_quality_mask=29 \ persist.bluetooth.bqr.vnd_trace_mask=0 \ persist.bluetooth.vendor.btsnoop=true else PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.event_mask=295262 \ persist.bluetooth.bqr.vnd_quality_mask=16 \ persist.bluetooth.bqr.vnd_trace_mask=0 \ persist.bluetooth.vendor.btsnoop=false @@ -215,8 +222,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.profile.bap.broadcast.assist.enabled=true \ - bluetooth.profile.bap.broadcast.source.enabled=true + bluetooth.profile.bap.broadcast.assist.enabled?=true \ + bluetooth.profile.bap.broadcast.source.enabled?=true # Bluetooth LE Audio enable hardware offloading PRODUCT_PRODUCT_PROPERTIES += \ @@ -240,6 +247,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Disable Bluetooth HAP by default +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.profile.hap.enabled_by_default=false + # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.ble.allow_enc_with_bredr=true diff --git a/husky/rro_overlays/UwbOverlay/Android.bp b/husky/rro_overlays/UwbOverlay/Android.bp index d173e90..90e8be2 100644 --- a/husky/rro_overlays/UwbOverlay/Android.bp +++ b/husky/rro_overlays/UwbOverlay/Android.bp @@ -14,5 +14,13 @@ runtime_resource_overlay { theme: "UwbOverlayHK3", certificate: "platform", sdk_version: "current", - product_specific: true + product_specific: true, +} + +runtime_resource_overlay { + name: "UwbOverlayHK3Gsi", + theme: "UwbOverlayHK3", + certificate: "platform", + sdk_version: "current", + vendor: true, } diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index 18109c6..0000000 --- a/manifest.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - default - - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - - - android.hardware.media.omx - hwbinder - 1.0 - - IOmx - default - - - IOmxStore - default - - - - android.hardware.graphics.allocator - hwbinder - 4.0 - - IAllocator - default - - - - android.hardware.graphics.composer - hwbinder - 2.4 - - IComposer - default - - - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - - - android.hardware.dumpstate - hwbinder - 1.1 - - IDumpstateDevice - default - - - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - - - android.hardware.boot - hwbinder - @1.2::IBootControl/default - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/google-edgetpu - - - android.hardware.health - hwbinder - 2.1 - - IHealth - default - - - - vendor.google.whitechapel.audio.audioext - hwbinder - 4.0 - - IAudioExt - default - - - - diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 8a52086..7c31725 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -111,7 +111,17 @@ "2000", "500" ], - "DefaultIndex": 0, + "DefaultIndex": 2, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterResponseTimeMs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/response_time_ms", + "Values": [ + "9", + "13" + ], + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -152,7 +162,17 @@ "2000", "500" ], - "DefaultIndex": 0, + "DefaultIndex": 3, + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterResponseTimeMs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/response_time_ms", + "Values": [ + "52", + "56" + ], + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -194,7 +214,17 @@ "2000", "500" ], - "DefaultIndex": 0, + "DefaultIndex": 3, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterResponseTimeMs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/response_time_ms", + "Values": [ + "178", + "180" + ], + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -265,6 +295,70 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "AutoMigrationMarginsEnable", + "Path": "/proc/vendor_sched/auto_migration_margins_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "AutoDvfsHeadroomEnable", + "Path": "/proc/vendor_sched/auto_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "TARampupMultiplier", + "Path": "/proc/vendor_sched/groups/ta/rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "AdpfRampupMultiplier", + "Path": "/proc/vendor_sched/adpf_rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 4, + "ResetOnInit": true + }, + { + "Name": "PerTaskMaxIowaitBoost", + "Path": "/proc/vendor_sched/per_task_iowait_boost_max_value", + "Values": [ + "0", + "512" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, { "Name": "CPUUClampMaxFilterEnable", "Path": "/proc/vendor_sched/uclamp_max_filter_enable", @@ -878,6 +972,26 @@ "20 40" ], "ResetOnInit": true + }, + { + "Name": "AAModeProperty", + "Path": "vendor.powerhal.mode.aa", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true, + "Type": "Property" + }, + { + "Name": "SYSTEM_UI_ADPF_PROFILES", + "Path": ":SYSTEM_UI", + "Values": [ + "SYSTEM_UI_PROFILE" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Event" } ], "Actions": [ @@ -1108,6 +1222,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TARampupMultiplier", + "Duration": 5000, + "Value": "4" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUSkipMask", @@ -1198,6 +1318,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "TARampupMultiplier", + "Duration": 2000, + "Value": "4" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -1399,6 +1525,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPUSkipMask", @@ -1921,6 +2053,42 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUDVFSHeadroom", @@ -2083,6 +2251,42 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", @@ -2275,6 +2479,42 @@ "Duration": 0, "Value": "cam1" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUUtilThreshold", @@ -2365,6 +2605,42 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUDVFSHeadroom", @@ -2575,6 +2851,24 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", @@ -2817,6 +3111,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -2828,6 +3128,48 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"DISPLAY_UPDATE_IMMINENT", + "EnableProperty": "vendor.powerhal.mode.aa" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"CPU_LOAD_RESET", + "EnableProperty": "vendor.powerhal.mode.aa" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "CPULittleClusterResponseTimeMs", + "Duration": 0, + "Value": "13" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "CPUMidClusterResponseTimeMs", + "Duration": 0, + "Value": "56" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "CPUBigClusterResponseTimeMs", + "Duration": 0, + "Value": "180" + }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "CPULittleClusterDownRateLimitUs", @@ -2930,6 +3272,54 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterResponseTimeMs", + "Duration": 0, + "Value": "9" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterResponseTimeMs", + "Duration": 0, + "Value": "52" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterResponseTimeMs", + "Duration": 0, + "Value": "178" + }, + { + "PowerHint": "GAME", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", @@ -3116,6 +3506,42 @@ "Duration": 2000, "Value": "44" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "PowerHALCameraRunning", @@ -3372,79 +3798,42 @@ "MaxRecordsNum": 300 }, { - "Name": "UiHighBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, + "Name": "SYSTEM_UI_PROFILE", + "PID_On": true, + "PID_Po": 2.0, + "PID_Pu": 0.5, + "PID_I": 0.0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500.0, + "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 196, - "UclampMin_Low": 196, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 730, + "UclampMin_LoadReset": 730, + "UclampMin_High": 480, + "UclampMin_Low": 2, "UclampMax_EfficientBase": 500, "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBoost": false - }, - { - "Name": "UiLowBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, "SamplingWindow_P": 1, - "SamplingWindow_I": 1, + "SamplingWindow_I": 0, "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 52, - "UclampMin_Low": 52, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, + "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBoost": false - }, - { - "Name": "UiLowNoneBoost", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 0, - "UclampMin_Low": 0, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBoost": false + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 100000, + "HeuristicBoost_On": true, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.3, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 } ] } diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 7435de5..6aaeb0c 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -111,7 +111,17 @@ "2000", "500" ], - "DefaultIndex": 0, + "DefaultIndex": 2, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterResponseTimeMs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/response_time_ms", + "Values": [ + "8", + "13" + ], + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -148,7 +158,17 @@ "2000", "500" ], - "DefaultIndex": 0, + "DefaultIndex": 3, + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterResponseTimeMs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/response_time_ms", + "Values": [ + "51", + "56" + ], + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -185,7 +205,17 @@ "2000", "500" ], - "DefaultIndex": 0, + "DefaultIndex": 3, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterResponseTimeMs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/response_time_ms", + "Values": [ + "167", + "170" + ], + "DefaultIndex": 1, "ResetOnInit": true }, { @@ -266,6 +296,70 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "AutoMigrationMarginsEnable", + "Path": "/proc/vendor_sched/auto_migration_margins_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "AutoDvfsHeadroomEnable", + "Path": "/proc/vendor_sched/auto_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "TARampupMultiplier", + "Path": "/proc/vendor_sched/groups/ta/rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "AdpfRampupMultiplier", + "Path": "/proc/vendor_sched/adpf_rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 4, + "ResetOnInit": true + }, + { + "Name": "PerTaskMaxIowaitBoost", + "Path": "/proc/vendor_sched/per_task_iowait_boost_max_value", + "Values": [ + "0", + "512" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, { "Name": "CPUUClampMaxFilterEnable", "Path": "/proc/vendor_sched/uclamp_max_filter_enable", @@ -879,6 +973,26 @@ "20 40" ], "ResetOnInit": true + }, + { + "Name": "AAModeProperty", + "Path": "vendor.powerhal.mode.aa", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true, + "Type": "Property" + }, + { + "Name": "SYSTEM_UI_ADPF_PROFILES", + "Path": ":SYSTEM_UI", + "Values": [ + "SYSTEM_UI_PROFILE" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Event" } ], "Actions": [ @@ -1109,6 +1223,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TARampupMultiplier", + "Duration": 5000, + "Value": "4" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUSkipMask", @@ -1199,6 +1319,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "TARampupMultiplier", + "Duration": 2000, + "Value": "4" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -1406,6 +1532,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPUSkipMask", @@ -1826,6 +1958,42 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUDVFSHeadroom", @@ -1988,6 +2156,42 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", @@ -2180,6 +2384,42 @@ "Duration": 0, "Value": "cam1" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUUtilThreshold", @@ -2270,6 +2510,42 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUDVFSHeadroom", @@ -2480,6 +2756,24 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", @@ -2722,6 +3016,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -2733,6 +3033,48 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"DISPLAY_UPDATE_IMMINENT", + "EnableProperty": "vendor.powerhal.mode.aa" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"CPU_LOAD_RESET", + "EnableProperty": "vendor.powerhal.mode.aa" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "CPULittleClusterResponseTimeMs", + "Duration": 0, + "Value": "13" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "CPUMidClusterResponseTimeMs", + "Duration": 0, + "Value": "56" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "CPUBigClusterResponseTimeMs", + "Duration": 0, + "Value": "170" + }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "CPULittleClusterDownRateLimitUs", @@ -2835,6 +3177,54 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterResponseTimeMs", + "Duration": 0, + "Value": "8" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterResponseTimeMs", + "Duration": 0, + "Value": "51" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterResponseTimeMs", + "Duration": 0, + "Value": "167" + }, + { + "PowerHint": "GAME", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", @@ -3021,6 +3411,42 @@ "Duration": 2000, "Value": "44" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "PerTaskMaxIowaitBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "5000" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "20000" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "PowerHALCameraRunning", @@ -3277,79 +3703,42 @@ "MaxRecordsNum": 300 }, { - "Name": "UiHighBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, + "Name": "SYSTEM_UI_PROFILE", + "PID_On": true, + "PID_Po": 2.0, + "PID_Pu": 0.5, + "PID_I": 0.0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500.0, + "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 196, - "UclampMin_Low": 196, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 730, + "UclampMin_LoadReset": 730, + "UclampMin_High": 480, + "UclampMin_Low": 2, "UclampMax_EfficientBase": 500, "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBoost": false - }, - { - "Name": "UiLowBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, "SamplingWindow_P": 1, - "SamplingWindow_I": 1, + "SamplingWindow_I": 0, "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 52, - "UclampMin_Low": 52, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, + "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBoost": false - }, - { - "Name": "UiLowNoneBoost", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 0, - "UclampMin_Low": 0, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBoost": false + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 100000, + "HeuristicBoost_On": true, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.3, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 } ] } diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 1ba87af..ee24971 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -54,11 +54,7 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"], - "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 + "Multiplier":0.001 }, { "Name":"quiet_therm", diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index e325805..1739177 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -54,11 +54,7 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"], - "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "Multiplier":0.001, - "PollingDelay":60000, - "PassiveDelay":7000 + "Multiplier":0.001 }, { "Name":"quiet_therm", diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 4710298..5622e21 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -31,6 +31,7 @@ WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true +WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled PRODUCT_COPY_FILES += \ device/google/shusky/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \