Merge changes I08b822af,Ie6b34209 into udc-qpr-dev am: 4247c7e9b6

Original change: https://googleplex-android-review.googlesource.com/c/device/google/akita/+/24210634

Change-Id: I33a72a884cb0017fcd97cfae60e634c7725d63b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peter (YM) 2023-07-28 11:16:40 +00:00 committed by Automerger Merge Worker
commit 2ef0354b2c
2 changed files with 54 additions and 11 deletions

View file

@ -754,18 +754,23 @@
"Name": "VIRTUAL-SKIN-CPU-MID", "Name": "VIRTUAL-SKIN-CPU-MID",
"Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile", "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile",
"Values": [ "Values": [
"game", "",
"" "game"
], ],
"DefaultIndex": 0,
"ResetOnInit": true,
"Type": "Property" "Type": "Property"
}, },
{ {
"Name": "VIRTUAL-SKIN-CPU-HIGH", "Name": "VIRTUAL-SKIN-CPU-HIGH",
"Path": "vendor.thermal.VIRTUAL-SKIN-CPU-HIGH.profile", "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-HIGH.profile",
"Values": [ "Values": [
"",
"game", "game",
"" "camera"
], ],
"DefaultIndex": 0,
"ResetOnInit": true,
"Type": "Property" "Type": "Property"
}, },
{ {
@ -1417,6 +1422,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -1561,6 +1572,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",
@ -1687,6 +1704,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "VIRTUAL-SKIN-CPU-HIGH",
"Duration": 0,
"Value": "camera"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning", "Node": "PowerHALCameraRunning",

View file

@ -354,6 +354,26 @@
"Disabled":true "Disabled":true
} }
] ]
},
{
"Mode": "camera",
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1,
"Disabled":true
},
{
"CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1,
"Disabled":true
}
]
} }
] ]
}, },
@ -389,8 +409,8 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S4M_VDD_CPUCL0", "BindedPowerRail": "S4M_VDD_CPUCL0",
"CdevCeiling": [0, 12, 12, 12, 12, 14, 14], "CdevCeiling": [0, 8, 8, 8, 8, 9, 9],
"LimitInfo": [0, 0, 0, 0, 12, 14, 14] "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
@ -398,8 +418,8 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S3M_VDD_CPUCL1", "BindedPowerRail": "S3M_VDD_CPUCL1",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16], "CdevCeiling": [0, 11, 11, 11, 11, 14, 14],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16] "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
@ -407,8 +427,8 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S2M_VDD_CPUCL2", "BindedPowerRail": "S2M_VDD_CPUCL2",
"CdevCeiling": [0, 14, 14, 14, 14, 16, 16], "CdevCeiling": [0, 13, 13, 13, 13, 14, 14],
"LimitInfo": [0, 0, 0, 0, 14, 16, 16] "LimitInfo": [0, 0, 0, 0, 0, 14, 14]
}, },
{ {
"CdevRequest": "thermal-gpufreq-0", "CdevRequest": "thermal-gpufreq-0",
@ -417,7 +437,7 @@
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"BindedPowerRail": "S2S_VDD_G3D", "BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11], "CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 9, 11, 11] "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
} }
] ]
}, },
@ -450,7 +470,7 @@
{ {
"CdevRequest": "thermal-gpufreq-0", "CdevRequest": "thermal-gpufreq-0",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"CdevCeiling": [0, 9, 9, 9, 11, 11, 11] "CdevCeiling": [0, 8, 8, 9, 11, 11, 11]
} }
] ]
}, },