From f8d8a2b2db11c67a9c4a54ea3c95a2b9c428c412 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 27 Feb 2024 01:48:20 +0000 Subject: [PATCH] Revert "Disable auto prefer idle if ta prefer_idle is explictly disabled" This reverts commit 3beb1e63644ff6ad5d5f06a0e607258c79a428ab. Reason for revert: to avoid potential power regression Bug: 326507991 Change-Id: If0fa9544c1848cfa5e195570c805653a33e52a75 Test: build pass --- 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 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 8331ad08..50f1951b 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -1114,12 +1114,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1636,12 +1630,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1804,12 +1792,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2092,12 +2074,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2555,12 +2531,6 @@ "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 8331ad08..50f1951b 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -1114,12 +1114,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1636,12 +1630,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1804,12 +1792,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2092,12 +2074,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2555,12 +2531,6 @@ "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 77375fc5..382cda60 100644 --- a/perf/powerhint-ripcurrent24.json +++ b/perf/powerhint-ripcurrent24.json @@ -1090,12 +1090,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1234,12 +1228,6 @@ "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 ae76be09..0bdc06e5 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -1114,12 +1114,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1636,12 +1630,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1804,12 +1792,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2092,12 +2074,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2555,12 +2531,6 @@ "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 8331ad08..50f1951b 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -1114,12 +1114,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1636,12 +1630,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1804,12 +1792,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2092,12 +2074,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2555,12 +2531,6 @@ "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 aeca1e72..0b5b35a7 100644 --- a/perf/powerhint-zuma.json +++ b/perf/powerhint-zuma.json @@ -1084,12 +1084,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "FGPreferIdle", @@ -1606,12 +1600,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CDHighCpusetCpus", @@ -1774,12 +1762,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDHighCpusetCpus", @@ -2056,12 +2038,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferIdle", @@ -2519,12 +2495,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "GAME", - "Node": "ReducePreferIdle", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "GAME", "Node": "FGPreferIdle",