From e2c032d180676b38ab79e8417238ebf51f1e8b6a Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 6 Oct 2022 11:03:09 +0000 Subject: [PATCH 1/5] Revert "Limit camera daemon cpuset to little cores when app launch" This reverts commit aca421cae44f269fc7628d77dcb66bd64409b7ee. Bug: 250900659 Change-Id: I835357599e4f97cbfc8259c4e0efcf4ea5d5826e --- powerhint-cheetah-a0.json | 88 --------------------------------------- powerhint-cheetah.json | 88 --------------------------------------- powerhint-panther-a0.json | 88 --------------------------------------- powerhint-panther.json | 88 --------------------------------------- 4 files changed, 352 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 37322c9..1207c8d 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -207,7 +207,6 @@ "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", "Values": [ - "0-3", "4-7", "0-7" ], @@ -226,7 +225,6 @@ "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ - "0-3", "6-7", "0-7" ], @@ -236,7 +234,6 @@ "Name": "CDMidCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ - "0-3", "4-5", "0-7" ], @@ -246,7 +243,6 @@ "Name": "CDMidHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ - "0-3", "4-7", "0-7" ], @@ -609,56 +605,12 @@ } ], "Actions": [ - { - "PowerHint": "CDCPUSET_RESTRICTED", - "Node": "CDCpuset", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", - "Node": "CDHighCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", - "Node": "CDMidCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", - "Node": "CDMidHighCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -701,26 +653,6 @@ "Duration": 5000, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -1453,26 +1385,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "CAMERA_GPU_HIGH", "Node": "GPUMinFreq", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index d4ab83c..a752ab3 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -233,7 +233,6 @@ "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", "Values": [ - "0-3", "4-7", "0-7" ], @@ -243,7 +242,6 @@ "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ - "0-3", "6-7", "0-7" ], @@ -253,7 +251,6 @@ "Name": "CDMidCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ - "0-3", "4-5", "0-7" ], @@ -263,7 +260,6 @@ "Name": "CDMidHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ - "0-3", "4-7", "0-7" ], @@ -628,30 +624,6 @@ } ], "Actions": [ - { - "PowerHint": "CDCPUSET_RESTRICTED", - "Node": "CDCpuset", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", - "Node": "CDHighCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", - "Node": "CDMidCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", - "Node": "CDMidHighCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -676,26 +648,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", @@ -743,26 +695,6 @@ "Duration": 5000, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -1495,26 +1427,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "CAMERA_GPU_HIGH", "Node": "GPUMinFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index aa8e60d..a5daca8 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -196,7 +196,6 @@ "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", "Values": [ - "0-3", "4-7", "0-7" ], @@ -215,7 +214,6 @@ "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ - "0-3", "6-7", "0-7" ], @@ -225,7 +223,6 @@ "Name": "CDMidCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ - "0-3", "4-5", "0-7" ], @@ -235,7 +232,6 @@ "Name": "CDMidHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ - "0-3", "4-7", "0-7" ], @@ -598,56 +594,12 @@ } ], "Actions": [ - { - "PowerHint": "CDCPUSET_RESTRICTED", - "Node": "CDCpuset", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", - "Node": "CDHighCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", - "Node": "CDMidCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", - "Node": "CDMidHighCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -690,26 +642,6 @@ "Duration": 5000, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -1340,26 +1272,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "CAMERA_GPU_HIGH", "Node": "GPUMinFreq", diff --git a/powerhint-panther.json b/powerhint-panther.json index e852c76..4298584 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -213,7 +213,6 @@ "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", "Values": [ - "0-3", "4-7", "0-7" ], @@ -223,7 +222,6 @@ "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ - "0-3", "6-7", "0-7" ], @@ -233,7 +231,6 @@ "Name": "CDMidCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ - "0-3", "4-5", "0-7" ], @@ -243,7 +240,6 @@ "Name": "CDMidHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ - "0-3", "4-7", "0-7" ], @@ -608,30 +604,6 @@ } ], "Actions": [ - { - "PowerHint": "CDCPUSET_RESTRICTED", - "Node": "CDCpuset", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", - "Node": "CDHighCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", - "Node": "CDMidCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, - { - "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", - "Node": "CDMidHighCpusetCpus", - "Duration": 1000, - "Value": "0-3" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -650,26 +622,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -712,26 +664,6 @@ "Duration": 5000, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_LAUNCH", - "Type": "EndHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -1362,26 +1294,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "CAMERA_VIDEO_RECORDING", - "Type": "MaskHint", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "CAMERA_GPU_HIGH", "Node": "GPUMinFreq", From 56b9136fdc57150afa4a6f525fa7ea817028df09 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 6 Oct 2022 19:33:43 +0000 Subject: [PATCH 2/5] Update panther SVN to 8 Bug: 250644806 Change-Id: Ib00528431082725eace045951b747524bd87136a --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index f6fba1e..eabed52 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -249,7 +249,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=7 + ro.vendor.build.svn=8 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 810337a8f74b7fa1fa0ec80edccaaebfcdc737d7 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Wed, 28 Sep 2022 17:24:53 +0000 Subject: [PATCH 3/5] Disable PMU at the start of camera launch A recent change (ag/20028064) has caused regression in GCA launch time due to activation of PMU at the camera launch time, and capping the CPU frequency. This CL prevents PMU activation for as long as we are in powerhints or power-boosts related to camera launch (LAUNCH, CAMERA_LAUNCH, CAMERA_LAUNCH_EXTENDED). Bug: 248718485 Test: Perfetto trace Change-Id: I6d88e4ccaf6790578223202ee69c105360cfc559 --- powerhint-cheetah-a0.json | 47 +++++++++++++++++++++++++++++---------- powerhint-cheetah.json | 47 +++++++++++++++++++++++++++++---------- powerhint-panther-a0.json | 47 +++++++++++++++++++++++++++++---------- powerhint-panther.json | 47 +++++++++++++++++++++++++++++---------- 4 files changed, 140 insertions(+), 48 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 1207c8d..299b45c 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -653,6 +653,17 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_PMU" + }, + { + "PowerHint": "LAUNCH_PMU", + "Node": "PMU_POLL", + "Duration": 3000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -713,6 +724,12 @@ "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMU_POLL", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -737,6 +754,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "PMU_POLL", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -1097,12 +1120,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1145,6 +1162,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", @@ -1211,12 +1234,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1259,6 +1276,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "EM_Profile", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index a752ab3..9362996 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -695,6 +695,17 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_PMU" + }, + { + "PowerHint": "LAUNCH_PMU", + "Node": "PMU_POLL", + "Duration": 3000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -755,6 +766,12 @@ "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMU_POLL", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -779,6 +796,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "PMU_POLL", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -1139,12 +1162,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1187,6 +1204,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", @@ -1253,12 +1276,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1301,6 +1318,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "EM_Profile", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index a5daca8..20e6528 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -642,6 +642,17 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_PMU" + }, + { + "PowerHint": "LAUNCH_PMU", + "Node": "PMU_POLL", + "Duration": 3000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -702,6 +713,12 @@ "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMU_POLL", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -726,6 +743,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "PMU_POLL", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -984,12 +1007,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1032,6 +1049,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", @@ -1098,12 +1121,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1146,6 +1163,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "EM_Profile", diff --git a/powerhint-panther.json b/powerhint-panther.json index 4298584..4fbae02 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -664,6 +664,17 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_PMU" + }, + { + "PowerHint": "LAUNCH_PMU", + "Node": "PMU_POLL", + "Duration": 3000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -724,6 +735,12 @@ "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "PMU_POLL", + "Duration": 1000, + "Value": "0" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -748,6 +765,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "PMU_POLL", + "Duration": 2000, + "Value": "0" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -1006,12 +1029,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1054,6 +1071,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", @@ -1120,12 +1143,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1168,6 +1185,12 @@ "Duration": 0, "Value": "50" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "EM_Profile", From 77108d67e3f551a7a73efa9e64180f156bcbb272 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Thu, 29 Sep 2022 22:09:41 +0000 Subject: [PATCH 4/5] Fixing regression in HDRnet latency due to PMU/EM profile feature activation in 30fps A recent change (ag/20028064) has caused regression in HDRnet latency due to activation of PMU feature and EM profile in 30fps. To mitigate this regression, this CL disables EM Profile and PMU features during the capture time (also increasing the boost profile duration from 1000ms to 2500ms). Bug: 249665681 Test: HDRnet latency from perfetto trace Change-Id: I892c9ea2e9b004cb4e47d10f61bc8fbf756682a7 --- powerhint-cheetah-a0.json | 18 +++++++++++++++--- powerhint-cheetah.json | 18 +++++++++++++++--- powerhint-panther-a0.json | 18 +++++++++++++++--- powerhint-panther.json | 18 +++++++++++++++--- 4 files changed, 60 insertions(+), 12 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 299b45c..7b25d79 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -781,21 +781,33 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1426000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1197000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1401000" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "PMU_POLL", + "Duration": 2500, + "Value": "0" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "EM_Profile", + "Duration": 2500, + "Value": "default" + }, { "PowerHint": "CAMERA_SHOT", "Node": "MemFreq", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 9362996..653e21d 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -823,21 +823,33 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1426000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1197000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1401000" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "PMU_POLL", + "Duration": 2500, + "Value": "0" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "EM_Profile", + "Duration": 2500, + "Value": "default" + }, { "PowerHint": "CAMERA_SHOT", "Node": "MemFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 20e6528..50f4f48 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -770,21 +770,33 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1426000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1197000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1401000" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "PMU_POLL", + "Duration": 2500, + "Value": "0" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "EM_Profile", + "Duration": 2500, + "Value": "default" + }, { "PowerHint": "CAMERA_SHOT", "Node": "MemFreq", diff --git a/powerhint-panther.json b/powerhint-panther.json index 4fbae02..e7dc6dc 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -792,21 +792,33 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1426000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1197000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, + "Duration": 2500, "Value": "1401000" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "PMU_POLL", + "Duration": 2500, + "Value": "0" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "EM_Profile", + "Duration": 2500, + "Value": "default" + }, { "PowerHint": "CAMERA_SHOT", "Node": "MemFreq", From f995ca64b8690defc9e9b7c5f47847a44dc4f528 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 6 Oct 2022 19:35:10 +0000 Subject: [PATCH 5/5] Update cheetah SVN to 8 Bug: 250644806 Change-Id: I9a15b7fa07a53c319b9792d6ee8ae6af467f5ec1 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 40521de..38e0dcf 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -262,7 +262,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=7 + ro.vendor.build.svn=8 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \