From 2a261b735d185893f6ca41e0659a04167be308eb Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 21 Nov 2023 11:32:23 -0800 Subject: [PATCH] Correct the powerhint and thermal config Bug: 312487312 Test: Komodo EVT1.0, and Caiman P1.0 can boot to home Change-Id: Ia72c16840fa97ea1cd3c08523253b4fcde2d3ab8 --- perf/powerhint-caiman.json | 36 -------------------- perf/powerhint-komodo.json | 36 -------------------- perf/powerhint-tokay.json | 42 ----------------------- thermal/thermal_info_config_komodo.json | 45 ++++++++++++++----------- 4 files changed, 25 insertions(+), 134 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index fa4a375b..0e394826 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -1625,18 +1625,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "VIRTUAL-SKIN-CPU-MID", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "VIRTUAL-SKIN-CPU-HIGH", - "Duration": 0, - "Value": "camera" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1793,18 +1781,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "VIRTUAL-SKIN-CPU-MID", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "VIRTUAL-SKIN-CPU-HIGH", - "Duration": 0, - "Value": "camera" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1937,18 +1913,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "VIRTUAL-SKIN-CPU-MID", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "VIRTUAL-SKIN-CPU-HIGH", - "Duration": 0, - "Value": "camera" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index fa4a375b..0e394826 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -1625,18 +1625,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "VIRTUAL-SKIN-CPU-MID", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "VIRTUAL-SKIN-CPU-HIGH", - "Duration": 0, - "Value": "camera" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1793,18 +1781,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "VIRTUAL-SKIN-CPU-MID", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "VIRTUAL-SKIN-CPU-HIGH", - "Duration": 0, - "Value": "camera" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1937,18 +1913,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "VIRTUAL-SKIN-CPU-MID", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "VIRTUAL-SKIN-CPU-HIGH", - "Duration": 0, - "Value": "camera" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 9d327551..0e394826 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -1625,24 +1625,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "VIRTUAL-SKIN-CPU-MID", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "VIRTUAL-SKIN-CPU-HIGH", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PowerHALCameraRunning", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1799,18 +1781,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "VIRTUAL-SKIN-CPU-MID", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "VIRTUAL-SKIN-CPU-HIGH", - "Duration": 0, - "Value": "camera" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1943,18 +1913,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "VIRTUAL-SKIN-CPU-MID", - "Duration": 0, - "Value": "camera" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "VIRTUAL-SKIN-CPU-HIGH", - "Duration": 0, - "Value": "camera" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 10520e61..9050e418 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -506,26 +506,31 @@ ] }, { - "CdevRequest": "thermal-cpufreq-0", - "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], - "MaxReleaseStep": 1, - "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] - }, - { - "CdevRequest": "thermal-cpufreq-1", - "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], - "MaxReleaseStep": 1, - "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] - }, - { - "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], - "MaxReleaseStep": 1, - "MaxThrottleStep": 2, - "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] - } + "Mode": "camera", + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], + "MaxReleaseStep": 1, + "MaxThrottleStep": 2, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], + "MaxReleaseStep": 1, + "MaxThrottleStep": 2, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] + } + ] + } ] }, {