From 07853908da150a74b15618b7a0b2a3955de0c580 Mon Sep 17 00:00:00 2001 From: Taeju Park Date: Tue, 11 Jan 2022 16:39:14 +0000 Subject: [PATCH] Remove a0 and a1 powerhints Bug: 208243183 Signed-off-by: Taeju Park Change-Id: I4a29445e7be74c280ce9d58eb8a1b7782aa9fcb6 --- conf/init.gs201.rc | 6 - device.mk | 5 - powerhint_a0.json | 396 --------------------------------------- powerhint_a1.json | 456 --------------------------------------------- 4 files changed, 863 deletions(-) delete mode 100644 powerhint_a0.json delete mode 100644 powerhint_a1.json diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 6d03ed8d..a53d21e7 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -268,12 +268,6 @@ on init on init setprop vendor.device.modules.ready 1 -on init && property:ro.boot.hw.soc.rev=0 - setprop vendor.powerhal.config powerhint_a0.json - -on init && property:ro.boot.hw.soc.rev=1 - setprop vendor.powerhal.config powerhint_a1.json - on late-fs # Wait for keymaster HALs exec_start wait_for_keymaster diff --git a/device.mk b/device.mk index 1be289b9..dd843f86 100644 --- a/device.mk +++ b/device.mk @@ -378,11 +378,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/gs201/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json -PRODUCT_COPY_FILES += \ - device/google/gs201/powerhint_a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a0.json - -PRODUCT_COPY_FILES += \ - device/google/gs201/powerhint_a1.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a1.json -include hardware/google/pixel/power-libperfmgr/aidl/device.mk # PowerStats HAL diff --git a/powerhint_a0.json b/powerhint_a0.json deleted file mode 100644 index f1673a07..00000000 --- a/powerhint_a0.json +++ /dev/null @@ -1,396 +0,0 @@ -{ - "Nodes": [ - { - "Name": "CPULittleClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", - "Values": [ - "9999999", - "1197000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPULittleClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", - "Values": [ - "9999999", - "1197000", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "CPUBigClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", - "Values": [ - "9999999", - "1999000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPUBigClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", - "Values": [ - "9999999", - "1197000", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "GPUMinFreq", - "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", - "Values": [ - "151000", - "302000", - "510000", - "572000", - "762000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "TAUClampBoost", - "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", - "Values": [ - "0", - "410", - "308", - "205", - "103" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "UfsClkGateEnable", - "Path": "/dev/sys/block/bootdevice/clkgate_enable", - "Values": [ - "0", - "1" - ], - "ResetOnInit": true - }, - { - "Name": "F2fsRecessModeEnable", - "Path": "/dev/sys/fs/by-name/userdata/gc_urgent", - "Values": [ - "2", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "DisplayWakeup", - "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", - "Values": [ - "1", - "0" - ] - }, - { - "Name": "PowerHALRenderingState", - "Path": "vendor.powerhal.rendering", - "Values": [ - "EXPENSIVE_RENDERING", - "" - ], - "Type": "Property" - } - ], - "Actions": [ - { - "PowerHint": "INTERACTION", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBigClusterMinFreq", - "Duration": 6000, - "Value": "1197000" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPULittleClusterMinFreq", - "Duration": 6000, - "Value": "1197000" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "INTERACTION_120", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "410" - }, - { - "PowerHint": "INTERACTION_90", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "308" - }, - { - "PowerHint": "INTERACTION_60", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "205" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "INTERACTION", - "Node": "UfsClkGateEnable", - "Duration": 200, - "Value": "0" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "F2fsRecessModeEnable", - "Duration": 0, - "Value": "2" - }, - { - "PowerHint": "LAUNCH", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUBigClusterMinFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterMaxFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterMinFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "308" - }, - { - "PowerHint": "LAUNCH", - "Node": "UfsClkGateEnable", - "Duration": 5000, - "Value": "0" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "F2fsRecessModeEnable", - "Duration": 0, - "Value": "2" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPULittleClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "UfsClkGateEnable", - "Duration": 1000, - "Value": "0" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1999000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "762000" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPUBigClusterMinFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPULittleClusterMinFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "EXPENSIVE_RENDERING", - "Node": "PowerHALRenderingState", - "Duration": 0, - "Value": "EXPENSIVE_RENDERING" - }, - { - "PowerHint": "EXPENSIVE_RENDERING", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "510000" - }, - { - "PowerHint": "REFRESH_120FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "308" - }, - { - "PowerHint": "REFRESH_90FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "205" - }, - { - "PowerHint": "REFRESH_60FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "103" - }, - { - "PowerHint": "DISABLE_TA_BOOST", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "DoHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "DISPLAY_UPDATE_IMMINENT" - }, - { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", - "Node": "DisplayWakeup", - "Duration": 50, - "Value": "1" - }, - { - "PowerHint": "FP_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FP_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - } - ] -} diff --git a/powerhint_a1.json b/powerhint_a1.json deleted file mode 100644 index 3d27938c..00000000 --- a/powerhint_a1.json +++ /dev/null @@ -1,456 +0,0 @@ -{ - "Nodes": [ - { - "Name": "CPULittleClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", - "Values": [ - "9999999", - "1197000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPULittleClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", - "Values": [ - "9999999", - "1197000", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "CPUMidClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", - "Values": [ - "9999999", - "1999000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPUMidClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", - "Values": [ - "9999999", - "1197000", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "CPUBigClusterMaxFreq", - "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", - "Values": [ - "9999999", - "1999000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "CPUBigClusterMinFreq", - "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq", - "Values": [ - "9999999", - "1106000", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "GPUMinFreq", - "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", - "Values": [ - "151000", - "302000", - "510000", - "572000", - "762000" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "TAUClampBoost", - "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", - "Values": [ - "0", - "410", - "308", - "205", - "103" - ], - "DefaultIndex": 0, - "ResetOnInit": true - }, - { - "Name": "UfsClkGateEnable", - "Path": "/dev/sys/block/bootdevice/clkgate_enable", - "Values": [ - "0", - "1" - ], - "ResetOnInit": true - }, - { - "Name": "F2fsRecessModeEnable", - "Path": "/dev/sys/fs/by-name/userdata/gc_urgent", - "Values": [ - "2", - "0" - ], - "ResetOnInit": true - }, - { - "Name": "DisplayWakeup", - "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", - "Values": [ - "1", - "0" - ] - }, - { - "Name": "LimitFlashCurrent", - "Path": "vendor.camera.max_flash_current", - "Values": [ - "100", - "1500" - ], - "ResetOnInit": true, - "Type": "Property" - }, - { - "Name": "PowerHALRenderingState", - "Path": "vendor.powerhal.rendering", - "Values": [ - "EXPENSIVE_RENDERING", - "" - ], - "Type": "Property" - } - ], - "Actions": [ - { - "PowerHint": "INTERACTION", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBigClusterMinFreq", - "Duration": 6000, - "Value": "1106000" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUMidClusterMinFreq", - "Duration": 6000, - "Value": "1197000" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPULittleClusterMinFreq", - "Duration": 6000, - "Value": "1197000" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "INTERACTION_120", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "410" - }, - { - "PowerHint": "INTERACTION_90", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "308" - }, - { - "PowerHint": "INTERACTION_60", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "205" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "INTERACTION", - "Node": "UfsClkGateEnable", - "Duration": 200, - "Value": "0" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "F2fsRecessModeEnable", - "Duration": 0, - "Value": "2" - }, - { - "PowerHint": "LAUNCH", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUMidClusterMaxFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPUMidClusterMinFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterMaxFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "CPULittleClusterMinFreq", - "Duration": 5000, - "Value": "9999999" - }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "308" - }, - { - "PowerHint": "LAUNCH", - "Node": "UfsClkGateEnable", - "Duration": 5000, - "Value": "0" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "F2fsRecessModeEnable", - "Duration": 0, - "Value": "2" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPULittleClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "UfsClkGateEnable", - "Duration": 1000, - "Value": "0" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1999000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "762000" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPUBigClusterMinFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPUMidClusterMaxFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPUMidClusterMinFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "FIXED_PERFORMANCE", - "Node": "CPULittleClusterMinFreq", - "Duration": 0, - "Value": "9999999" - }, - { - "PowerHint": "REFRESH_120FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "308" - }, - { - "PowerHint": "REFRESH_90FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "205" - }, - { - "PowerHint": "REFRESH_60FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "103" - }, - { - "PowerHint": "DISABLE_TA_BOOST", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "DoHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "DISPLAY_UPDATE_IMMINENT" - }, - { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", - "Node": "DisplayWakeup", - "Duration": 50, - "Value": "1" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, - { - "PowerHint": "EXPENSIVE_RENDERING", - "Node": "PowerHALRenderingState", - "Duration": 0, - "Value": "EXPENSIVE_RENDERING" - }, - { - "PowerHint": "EXPENSIVE_RENDERING", - "Node": "GPUMinFreq", - "Duration": 0, - "Value": "510000" - }, - { - "PowerHint": "FP_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FP_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - } - ] -}