From 29f7f5e0a21f8013101dc0a0e71b54f3fe0f0f47 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Fri, 26 May 2023 10:36:31 -0700 Subject: [PATCH 1/3] powerhint: fix DISPLAY_UPDATE_IMMINENT down_rate_limit hint Bug: b/283319548 Test: Check traces during screen off to on transition Change-Id: Ia37d1a3aa20d3f385ea5885c5d6a967cbdf52704 --- perf/powerhint-husky.json | 6 +++--- perf/powerhint-shiba.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 1e7fcdc..c3affb5 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2110,19 +2110,19 @@ { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 0, + "Duration": 50, "Value": "5000" }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 0, + "Duration": 50, "Value": "20000" }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 0, + "Duration": 50, "Value": "20000" }, { diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index dbf412c..8cd3cb9 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -846,19 +846,19 @@ { "PowerHint": "DISPLAY_INACTIVE", "Node": "CPULittleClusterDownRateLimitUs", - "Duration": 0, + "Duration": 50, "Value": "500" }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "CPUMidClusterDownRateLimitUs", - "Duration": 0, + "Duration": 50, "Value": "500" }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "CPUBigClusterDownRateLimitUs", - "Duration": 0, + "Duration": 50, "Value": "500" }, { From ffd1f4378653c05fc156d77c276b44cebdc9a7ec Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Fri, 26 May 2023 20:14:01 +0000 Subject: [PATCH 2/3] Update Sound_trigger interrupt mapping Test: Manually verify the output of `dumpsys batterystats --wakeups` Bug: 284405919 Change-Id: Id0f98388ead4cb7d50a08b9c047e51784f34acc5 --- .../overlay/frameworks/base/core/res/res/xml/irq_device_map.xml | 2 +- .../overlay/frameworks/base/core/res/res/xml/irq_device_map.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index edeba97..6a1cb5a 100644 --- a/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,7 +26,7 @@ Cellular_data - + Sound_trigger diff --git a/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index edeba97..6a1cb5a 100644 --- a/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,7 +26,7 @@ Cellular_data - + Sound_trigger From 1e6f2fad18097456d97b2fc9b43f1acc7ba44368 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Fri, 26 May 2023 15:08:00 -0700 Subject: [PATCH 3/3] perf: change the order of the rate limit vote Bug: b/283319548 Test: none Change-Id: Icf23f3ce0286045846785459ef8066ff5ae5b8c2 Signed-off-by: Wei Wang --- perf/powerhint-husky.json | 15 +++++++++------ perf/powerhint-shiba.json | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index c3affb5..2cd0c42 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -96,10 +96,11 @@ "Name": "CPULittleClusterDownRateLimitUs", "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ - "500", + "5000", "2000", - "5000" + "500" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -138,10 +139,11 @@ "Name": "CPUMidClusterDownRateLimitUs", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ - "500", + "20000", "2000", - "20000" + "500" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -182,10 +184,11 @@ "Name": "CPUBigClusterDownRateLimitUs", "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ - "500", + "20000", "2000", - "20000" + "500" ], + "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 8cd3cb9..b7021ff 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -96,10 +96,11 @@ "Name": "CPULittleClusterDownRateLimitUs", "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ - "500", + "5000", "2000", - "5000" + "500" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -134,10 +135,11 @@ "Name": "CPUMidClusterDownRateLimitUs", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ - "500", + "20000", "2000", - "20000" + "500" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -172,10 +174,11 @@ "Name": "CPUBigClusterDownRateLimitUs", "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ - "500", + "20000", "2000", - "20000" + "500" ], + "DefaultIndex": 0, "ResetOnInit": true }, {