From 6419d5e67d3153176e55a81b9f62df430c46dafa Mon Sep 17 00:00:00 2001
From: "Ali K. Zadeh" <alikz@google.com>
Date: Wed, 7 Jun 2023 17:46:48 +0000
Subject: [PATCH 1/2] Remove CPU hard-caps and enable PMU for 30fps

Bug: 285043350
Test: ODPM/Framedrops (https://docs.google.com/spreadsheets/d/1fch2nTNXzsjrlsTwgj5asMULLSzW_iaKQRGv9sTZJvw/edit?usp=sharing&resourcekey=0-TYGsgX17mWRZdPYL3tBnjA)
Change-Id: Icf6af9d289f0facdbeb92910b8f963384dda6149
---
 perf/powerhint-husky.json      | 45 ++++++++++++++++------------------
 perf/powerhint-ripcurrent.json | 45 ++++++++++++++++------------------
 perf/powerhint-shiba.json      | 45 ++++++++++++++++------------------
 3 files changed, 63 insertions(+), 72 deletions(-)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index f6a8d5d..a5d98b3 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -645,6 +645,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
         "70",
+        "42",
         "35",
         "30",
         "20",
@@ -675,7 +676,8 @@
       "Values": [
         "50",
         "30",
-        "20"
+        "20",
+        "18"
       ],
       "DefaultIndex": 0
     },
@@ -701,6 +703,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
       "Values": [
         "50",
+        "22",
         "20"
       ],
       "DefaultIndex": 0
@@ -1620,6 +1623,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_LIT_LIMIT_FREQ",
+      "Duration": 0,
+      "Value": "1098000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_LCPI_THRESHOLD",
@@ -1630,7 +1639,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "0"
+      "Value": "42"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_MID_LIMIT_FREQ",
+      "Duration": 0,
+      "Value": "1328000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1642,13 +1657,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "50"
+      "Value": "18"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_BIG_LIMIT_FREQ",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1298000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1660,13 +1675,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "50"
+      "Value": "22"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_POLL",
       "Duration": 0,
-      "Value": "0"
+      "Value": "1"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1692,24 +1707,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1852000"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1622000"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1475000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index c955dea..9d2b505 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -628,6 +628,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
         "70",
+        "42",
         "35",
         "30",
         "20",
@@ -658,7 +659,8 @@
       "Values": [
         "50",
         "30",
-        "20"
+        "20",
+        "18"
       ],
       "DefaultIndex": 0
     },
@@ -684,6 +686,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
       "Values": [
         "50",
+        "22",
         "20"
       ],
       "DefaultIndex": 0
@@ -1478,6 +1481,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_LIT_LIMIT_FREQ",
+      "Duration": 0,
+      "Value": "1098000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_LCPI_THRESHOLD",
@@ -1488,7 +1497,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "0"
+      "Value": "42"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_MID_LIMIT_FREQ",
+      "Duration": 0,
+      "Value": "1328000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1500,13 +1515,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "50"
+      "Value": "18"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_BIG_LIMIT_FREQ",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1298000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1518,13 +1533,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "50"
+      "Value": "22"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_POLL",
       "Duration": 0,
-      "Value": "0"
+      "Value": "1"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1550,24 +1565,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1852000"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1622000"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1475000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 04b7c7d..93dc9a9 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -645,6 +645,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
         "70",
+        "42",
         "35",
         "30",
         "20",
@@ -675,7 +676,8 @@
       "Values": [
         "50",
         "30",
-        "20"
+        "20",
+        "18"
       ],
       "DefaultIndex": 0
     },
@@ -701,6 +703,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
       "Values": [
         "50",
+        "22",
         "20"
       ],
       "DefaultIndex": 0
@@ -1518,6 +1521,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_LIT_LIMIT_FREQ",
+      "Duration": 0,
+      "Value": "1098000"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_LCPI_THRESHOLD",
@@ -1528,7 +1537,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "0"
+      "Value": "42"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "PMU_MID_LIMIT_FREQ",
+      "Duration": 0,
+      "Value": "1328000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1540,13 +1555,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "50"
+      "Value": "18"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_BIG_LIMIT_FREQ",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1298000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1558,13 +1573,13 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "50"
+      "Value": "22"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_POLL",
       "Duration": 0,
-      "Value": "0"
+      "Value": "1"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -1590,24 +1605,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1852000"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1622000"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1475000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",

From 3f86a05db90e4853a3a1f7086560917c14472423 Mon Sep 17 00:00:00 2001
From: Linyu He <linyuh@google.com>
Date: Wed, 21 Jun 2023 20:27:09 +0000
Subject: [PATCH 2/2] [Zuma 8k] Remove 8K from "shusky" (P23) media_profiles on
 udc-d1-dev

Zuma 8K won't be shipped on P23 devices, so "8K" should be removed
from media_profiles as it's visible to the public.

This CL removes 8K support on udc-d1-dev, which is the branch for
launching P23.

To continue developing 8K using P23 devices, we'll re-enable 8K support
on udc-qpr-dev with a follow-up CL.

Bug: 288304801
Test: python gca_smoke.py
Test: CTS & PTS
Change-Id: Ie0c35ea2c2bb1ab49912b69079b2038b42f632f1
---
 media_profiles_husky.xml      | 21 ++++-----------------
 media_profiles_ripcurrent.xml | 21 ++++-----------------
 media_profiles_shiba.xml      | 21 ++++-----------------
 3 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/media_profiles_husky.xml b/media_profiles_husky.xml
index cfc89bb..8abc330 100644
--- a/media_profiles_husky.xml
+++ b/media_profiles_husky.xml
@@ -79,19 +79,6 @@
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <CamcorderProfiles cameraId="0">
 
-        <EncoderProfile quality="8kuhd" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="80000000"
-                   width="7680"
-                   height="4320"
-                   frameRate="30" />
-
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <EncoderProfile quality="high" fileFormat="mp4" duration="60">
             <Video codec="h264"
                    bitRate="72000000"
@@ -1762,14 +1749,14 @@
     -->
     <VideoEncoderCap name="hevc" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
diff --git a/media_profiles_ripcurrent.xml b/media_profiles_ripcurrent.xml
index 20e20ee..6e2977d 100644
--- a/media_profiles_ripcurrent.xml
+++ b/media_profiles_ripcurrent.xml
@@ -79,19 +79,6 @@
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <CamcorderProfiles cameraId="0">
 
-        <EncoderProfile quality="8kuhd" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="80000000"
-                   width="7680"
-                   height="4320"
-                   frameRate="30" />
-
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <EncoderProfile quality="high" fileFormat="mp4" duration="60">
             <Video codec="h264"
                    bitRate="72000000"
@@ -1762,14 +1749,14 @@
     -->
     <VideoEncoderCap name="hevc" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
diff --git a/media_profiles_shiba.xml b/media_profiles_shiba.xml
index 4b3b8e3..1da2154 100644
--- a/media_profiles_shiba.xml
+++ b/media_profiles_shiba.xml
@@ -79,19 +79,6 @@
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <CamcorderProfiles cameraId="0">
 
-        <EncoderProfile quality="8kuhd" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="80000000"
-                   width="7680"
-                   height="4320"
-                   frameRate="30" />
-
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <EncoderProfile quality="high" fileFormat="mp4" duration="60">
             <Video codec="h264"
                    bitRate="72000000"
@@ -1394,14 +1381,14 @@
     -->
     <VideoEncoderCap name="hevc" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="100000000"
-        minFrameWidth="128" maxFrameWidth="7680"
-        minFrameHeight="96" maxFrameHeight="4320"
+        minFrameWidth="128" maxFrameWidth="3840"
+        minFrameHeight="96" maxFrameHeight="2160"
         minFrameRate="15" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"