From 3beb1e63644ff6ad5d5f06a0e607258c79a428ab Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Fri, 23 Feb 2024 07:43:18 +0000 Subject: [PATCH] Disable auto prefer idle if ta prefer_idle is explictly disabled In auto prefer idle mode, a task in top-app will be granted prefer idle if it satisfied the conditions. So turn auto prefer idle off if top-app prefer_idle is explictly disabled. Bug: 326507991 Test: build pass Change-Id: Ie8d02bcc2291c00f12c337220d0d7ad80729d6a9 --- perf/powerhint-caiman.json | 30 ++++++++++++++++++++++++++++++ perf/powerhint-komodo.json | 30 ++++++++++++++++++++++++++++++ perf/powerhint-ripcurrent24.json | 12 ++++++++++++ perf/powerhint-ripcurrentpro.json | 30 ++++++++++++++++++++++++++++++ perf/powerhint-tokay.json | 30 ++++++++++++++++++++++++++++++ perf/powerhint-zuma.json | 30 ++++++++++++++++++++++++++++++ 6 files changed, 162 insertions(+) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 50f1951b..8331ad08 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -1114,6 +1114,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1630,6 +1636,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1792,6 +1804,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2074,6 +2092,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2531,6 +2555,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "GAME", "Node": "FGPreferIdle", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 50f1951b..8331ad08 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -1114,6 +1114,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1630,6 +1636,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1792,6 +1804,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2074,6 +2092,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2531,6 +2555,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "GAME", "Node": "FGPreferIdle", diff --git a/perf/powerhint-ripcurrent24.json b/perf/powerhint-ripcurrent24.json index 382cda60..77375fc5 100644 --- a/perf/powerhint-ripcurrent24.json +++ b/perf/powerhint-ripcurrent24.json @@ -1090,6 +1090,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1228,6 +1234,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 0bdc06e5..ae76be09 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -1114,6 +1114,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1630,6 +1636,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1792,6 +1804,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2074,6 +2092,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2531,6 +2555,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "GAME", "Node": "FGPreferIdle", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 50f1951b..8331ad08 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -1114,6 +1114,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1630,6 +1636,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1792,6 +1804,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2074,6 +2092,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2531,6 +2555,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "GAME", "Node": "FGPreferIdle", diff --git a/perf/powerhint-zuma.json b/perf/powerhint-zuma.json index 0b5b35a7..aeca1e72 100644 --- a/perf/powerhint-zuma.json +++ b/perf/powerhint-zuma.json @@ -1084,6 +1084,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1600,6 +1606,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1762,6 +1774,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2038,6 +2056,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2495,6 +2519,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "ReducePreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "GAME", "Node": "FGPreferIdle",