From f5d247a3f21a51425189a35d4084a67cf0e91a51 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Sat, 17 Aug 2024 14:08:16 +0000 Subject: [PATCH] Revert^2 "Set max load balance to 4, reduce Downrate Limit for lit and mid cores" This reverts commit e00b219010e0e9f3c08f8943ca588596824c7b2f. Reason for revert: Fix the tokay powerhint Test: tokay device boots successfully Bug: 354763942 Change-Id: I218bd68a770bf8af43f154a51cdc31521486950f --- perf/powerhint-caiman.json | 42 ++++++++++++++++++++++++++----- perf/powerhint-komodo.json | 42 ++++++++++++++++++++++++++----- perf/powerhint-ripcurrentpro.json | 28 +++++++++++++++++++++ perf/powerhint-tokay.json | 42 ++++++++++++++++++++++++++----- 4 files changed, 136 insertions(+), 18 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 3d76f979..f557c4f1 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -56,6 +56,7 @@ "Values": [ "5000", "2000", + "1000", "500" ], "DefaultIndex": 0, @@ -94,6 +95,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", + "5000", "3000", "2000", "500" @@ -949,6 +951,16 @@ "200" ], "ResetOnInit": true + }, + { + "Name": "MaxLoadBalanceInterval", + "Path": "/proc/vendor_sched/max_load_balance_interval", + "Values": [ + "1", + "4" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -2019,13 +2031,13 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "1000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "20000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -2111,6 +2123,12 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2193,13 +2211,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "1000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "20000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2303,6 +2321,12 @@ "Duration": 0, "Value": "0x80" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2391,13 +2415,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "1000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "20000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2477,6 +2501,12 @@ "Duration": 0, "Value": "0x80" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 2d36ee82..1dddb841 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -56,6 +56,7 @@ "Values": [ "5000", "2000", + "1000", "500" ], "DefaultIndex": 0, @@ -94,6 +95,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", + "5000", "3000", "2000", "500" @@ -949,6 +951,16 @@ "200" ], "ResetOnInit": true + }, + { + "Name": "MaxLoadBalanceInterval", + "Path": "/proc/vendor_sched/max_load_balance_interval", + "Values": [ + "1", + "4" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -2019,13 +2031,13 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "1000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "20000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -2111,6 +2123,12 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2193,13 +2211,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "1000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "20000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2303,6 +2321,12 @@ "Duration": 0, "Value": "0x80" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2391,13 +2415,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "1000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "20000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2477,6 +2501,12 @@ "Duration": 0, "Value": "0x80" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 875cb2cf..81858c83 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -875,6 +875,16 @@ "200" ], "ResetOnInit": true + }, + { + "Name": "MaxLoadBalanceInterval", + "Path": "/proc/vendor_sched/max_load_balance_interval", + "Values": [ + "1", + "4" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -1995,6 +2005,12 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2151,6 +2167,12 @@ "Duration": 0, "Value": "0x80" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2289,6 +2311,12 @@ "Duration": 0, "Value": "0x80" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 3d76f979..f557c4f1 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -56,6 +56,7 @@ "Values": [ "5000", "2000", + "1000", "500" ], "DefaultIndex": 0, @@ -94,6 +95,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", + "5000", "3000", "2000", "500" @@ -949,6 +951,16 @@ "200" ], "ResetOnInit": true + }, + { + "Name": "MaxLoadBalanceInterval", + "Path": "/proc/vendor_sched/max_load_balance_interval", + "Values": [ + "1", + "4" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -2019,13 +2031,13 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "1000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "20000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -2111,6 +2123,12 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2193,13 +2211,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "1000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "20000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2303,6 +2321,12 @@ "Duration": 0, "Value": "0x80" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2391,13 +2415,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "1000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "20000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2477,6 +2501,12 @@ "Duration": 0, "Value": "0x80" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MaxLoadBalanceInterval", + "Duration": 0, + "Value": "4" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle",