From 376bde93d1d771f127c5f5199835af01172a7fd0 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 6 Oct 2022 10:47:58 +0800 Subject: [PATCH 1/2] Update SVN to 7 Bug: 251321639 Change-Id: I30dcdc1a550b2a4baca594f81211db053d219f53 --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 233e124..3d841c4 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -244,7 +244,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=7 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-panther.mk b/device-panther.mk index 00c0507..3a59ef0 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -231,7 +231,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=7 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e2c032d180676b38ab79e8417238ebf51f1e8b6a Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 6 Oct 2022 11:03:09 +0000 Subject: [PATCH 2/2] 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",