From 4d513912060ba506b215ad9252f50ee9ed18a650 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Fri, 15 Mar 2024 16:26:29 -0700 Subject: [PATCH] powerhint: revert dvfs_headroom settings for camera Bug: 329905546 Test: boot (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ba80daae83f80c2a810ce7b7a86dfc0f7c7fc820) Merged-In: Ieb0869ab6e57a163ead89469f426be2d3e2f76a8 Change-Id: Ieb0869ab6e57a163ead89469f426be2d3e2f76a8 --- perf/powerhint-caiman.json | 22 +++++++++++----------- perf/powerhint-komodo.json | 22 +++++++++++----------- perf/powerhint-ripcurrentpro.json | 22 +++++++++++----------- perf/powerhint-tokay.json | 22 +++++++++++----------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index edc1a5e1..a2c9444d 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -220,7 +220,7 @@ "2048 1280 1280", "1280", "1100", - "1100 1078 1024" + "1100 1024 1100" ], "DefaultIndex": 0, "ResetOnInit": true @@ -231,7 +231,7 @@ "Values": [ "1280", "1100", - "1100 1078 1024" + "1280 1100 1055" ], "DefaultIndex": 1, "ResetOnInit": true @@ -1854,13 +1854,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100 1078 1024" + "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100 1078 1024" + "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1934,12 +1934,6 @@ "Duration": 0, "Value": "700000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1280" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -2016,7 +2010,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1280" + "Value": "1100 1024 1100" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280 1100 1055" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index edc1a5e1..a2c9444d 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -220,7 +220,7 @@ "2048 1280 1280", "1280", "1100", - "1100 1078 1024" + "1100 1024 1100" ], "DefaultIndex": 0, "ResetOnInit": true @@ -231,7 +231,7 @@ "Values": [ "1280", "1100", - "1100 1078 1024" + "1280 1100 1055" ], "DefaultIndex": 1, "ResetOnInit": true @@ -1854,13 +1854,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100 1078 1024" + "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100 1078 1024" + "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1934,12 +1934,6 @@ "Duration": 0, "Value": "700000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1280" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -2016,7 +2010,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1280" + "Value": "1100 1024 1100" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280 1100 1055" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index edc1a5e1..a2c9444d 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -220,7 +220,7 @@ "2048 1280 1280", "1280", "1100", - "1100 1078 1024" + "1100 1024 1100" ], "DefaultIndex": 0, "ResetOnInit": true @@ -231,7 +231,7 @@ "Values": [ "1280", "1100", - "1100 1078 1024" + "1280 1100 1055" ], "DefaultIndex": 1, "ResetOnInit": true @@ -1854,13 +1854,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100 1078 1024" + "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100 1078 1024" + "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1934,12 +1934,6 @@ "Duration": 0, "Value": "700000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1280" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -2016,7 +2010,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1280" + "Value": "1100 1024 1100" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280 1100 1055" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index edc1a5e1..a2c9444d 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -220,7 +220,7 @@ "2048 1280 1280", "1280", "1100", - "1100 1078 1024" + "1100 1024 1100" ], "DefaultIndex": 0, "ResetOnInit": true @@ -231,7 +231,7 @@ "Values": [ "1280", "1100", - "1100 1078 1024" + "1280 1100 1055" ], "DefaultIndex": 1, "ResetOnInit": true @@ -1854,13 +1854,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100 1078 1024" + "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100 1078 1024" + "Value": "1100" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1934,12 +1934,6 @@ "Duration": 0, "Value": "700000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUDVFSHeadroom", - "Duration": 0, - "Value": "1280" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -2016,7 +2010,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1280" + "Value": "1100 1024 1100" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1280 1100 1055" }, { "PowerHint": "CAMERA_STREAMING_STANDARD",