From f2a5afd1364e6be50b6b95be14c2b94b4ee9e332 Mon Sep 17 00:00:00 2001
From: Edmond Chung <edmondchung@google.com>
Date: Wed, 19 May 2021 18:21:06 +0000
Subject: [PATCH] Revert "Update power hint for camera workload"

This reverts commit 3a0efffdbc722cb8a9684ce3c0080d2476c0abb8.

Reason for revert: This CL causes performance/frame drop issues which leads to more CTS flakiness.

Bug: 188462637
Bug: 185233206
Test: Camera CTS
Change-Id: I1796ba29da0e2c19874531bda8c21bc10e248055
---
 conf/init.gs101.rc |  2 +-
 powerhint.json     | 70 ----------------------------------------------
 2 files changed, 1 insertion(+), 71 deletions(-)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 59fdba8b..b4b9df16 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -137,7 +137,7 @@ on init
     # change permissions and default values for camera-daemon cpu controller
     chown system system /dev/cpuctl/camera-daemon/cpu.uclamp.min
     chown system system /dev/cpuctl/camera-daemon/cpu.uclamp.max
-    chown root root /dev/cpuctl/camera-daemon/cpu.uclamp.latency_sensitive
+    chown system system /dev/cpuctl/camera-daemon/cpu.uclamp.latency_sensitive
     chown system system /dev/cpuctl/camera-daemon/cgroup.procs
 
     write /sys/kernel/vendor_sched/cam_prefer_idle 1
diff --git a/powerhint.json b/powerhint.json
index fe066683..a58a18b2 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -5,7 +5,6 @@
       "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq",
       "Values": [
         "3172000",
-        "1014000",
         "421000"
       ],
       "ResetOnInit": true
@@ -116,15 +115,6 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
-    {
-      "Name": "CDPreferIdle",
-      "Path": "/sys/kernel/vendor_sched/cam_prefer_idle",
-      "Values": [
-        "0",
-        "1"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "F2fsRecessModeEnable",
       "Path": "/dev/sys/fs/by-name/userdata/gc_urgent",
@@ -134,24 +124,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "CDPreferHighCap",
-      "Path": "/sys/kernel/vendor_sched/cam_prefer_high_cap",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "ResetOnInit": true
-    },
-    {
-      "Name": "HighCapacityStartCpu",
-      "Path": "/sys/kernel/vendor_sched/high_capacity_start_cpu",
-      "Values": [
-        "4",
-        "6"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "DisplayWakeup",
       "Path": "/sys/devices/platform/1c300000.drmdecon/early_wakeup",
@@ -359,18 +331,6 @@
       "Duration": 0,
       "Value": "1826000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "CDPreferHighCap",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "HighCapacityStartCpu",
-      "Duration": 0,
-      "Value": "4"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPULittleClusterMaxFreq",
@@ -383,36 +343,12 @@
       "Duration": 0,
       "Value": "302000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "MemFreq",
-      "Duration": 0,
-      "Value": "1014000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MIFTargetLoad",
       "Duration": 0,
       "Value": "20 10 80"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CDPreferHighCap",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "HighCapacityStartCpu",
-      "Duration": 0,
-      "Value": "4"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CDPreferIdle",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CPUBigClusterMaxFreq",
@@ -431,12 +367,6 @@
       "Duration": 0,
       "Value": "302000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "MemFreq",
-      "Duration": 0,
-      "Value": "1014000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MIFTargetLoad",