From 8c09f99b21bcefbfe4782005335659f2cbb1326d Mon Sep 17 00:00:00 2001
From: Emma Zhou <zzhiyuan@codeaurora.org>
Date: Fri, 21 Aug 2020 12:32:06 +0800
Subject: [PATCH 1/5] qvr powerhint for Lahaina

CRs-Fixed: 2708823

Change-Id: I3ff361394007415dbfa42b6fffa6d824a4cada36
Signed-off-by: Emma Zhou <zzhiyuan@codeaurora.org>
---
 config/lahaina/powerhint.xml | 158 ++++++++++++++++++++++++++++++++---
 1 file changed, 147 insertions(+), 11 deletions(-)

diff --git a/config/lahaina/powerhint.xml b/config/lahaina/powerhint.xml
index b7e8295..3494f6f 100644
--- a/config/lahaina/powerhint.xml
+++ b/config/lahaina/powerhint.xml
@@ -50,23 +50,159 @@
             Id="0x00001301" Enable="true" Target="lahaina"
             Resources=""/>
 
+
         <!-- qvr level cpu1 gpu1 -->
-        <!-- B CPU - Cluster min freq ~.864 Ghz -->
-        <!-- B CPU - Cluster max freq ~.2.016 Ghz -->
-        <!-- L CPU - Cluster min freq ~.576 Ghz -->
-        <!-- L CPU - Cluster max freq ~1.267 Ghz -->
-        <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
-        <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
-        <!-- GPU - min pwrlevel 5 (freq 215 Mhz) -->
-        <!-- GPU - max pwrlevel 0 (freq 600 Mhz) -->
+        <!-- B CPU - Cluster min freq ~.902 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~. 595 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.286 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.921 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.112 Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 315 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 710 Mhz) -->
         <!-- Min Big CPUs 3 -->
         <!-- Min Prime CPUs 1 -->
         <!-- Idefinite Duration -->
         <Config
             Id="0x0000130A" Enable="true" Target="lahaina" Timeout="0"
-            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240,
-            0x40804100, 0x4F3, 0x40800200, 0x3AD, 0x40804200, 0x806, 0x42804000, 0x3,
-            0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+            Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu1 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.902 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~. 595 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.286 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.921 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.112 Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 315 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 710 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130B" Enable="true" Target="lahaina" Timeout="0"
+            Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu1 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.902 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~. 595 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.286 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.921 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.112 Ghz -->
+        <!-- GPU - min pwrlevel 0 (freq 710 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 710 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130C" Enable="true" Target="lahaina" Timeout="0"
+            Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
+            0x42804000, 0x0, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu2 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.902 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~. 595 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.286 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.921 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.112 Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 315 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 710 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130D" Enable="true" Target="lahaina" Timeout="0"
+            Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu2 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.902 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~. 595 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.286 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.921 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.112 Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 315 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 710 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130E" Enable="true" Target="lahaina" Timeout="0"
+            Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu2 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.902 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~. 595 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.286 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.921 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.112 Ghz -->
+        <!-- GPU - min pwrlevel 0 (freq 710 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 710 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130F" Enable="true" Target="lahaina" Timeout="0"
+            Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
+            0x42804000, 0x0, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu3 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.902 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~. 595 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.286 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.921 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.112 Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 315 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 710 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001310" Enable="true" Target="lahaina" Timeout="0"
+            Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu3 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.902 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~. 595 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.286 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.921 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.112 Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 315 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 710 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001311" Enable="true" Target="lahaina" Timeout="0"
+            Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu3 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.902 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~. 595 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.286 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.921 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.112 Ghz -->
+        <!-- GPU - min pwrlevel 0 (freq 710 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 710 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001312" Enable="true" Target="lahaina" Timeout="0"
+            Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
+            0x42804000, 0x0, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
 
         <!--camera general-->
         <!--CPU-LLC BWMON - Set sample_ms 16 -->

From a3038ec9312b1b2034f14c89466e59b0a21a5209 Mon Sep 17 00:00:00 2001
From: KANCHERL SAI YASHWANTH REDDY <kancherl@codeaurora.org>
Date: Fri, 4 Sep 2020 17:19:17 +0530
Subject: [PATCH 2/5] power : adding power hal for holi

Added powerhint.xml for holi and changed make file

Change-Id: Ibbc5908caec37719d766616326579ae3576eada0
---
 config/holi/powerhint.xml | 278 ++++++++++++++++++++++++++++++++++++++
 power-vendor-product.mk   |   2 +
 2 files changed, 280 insertions(+)
 create mode 100644 config/holi/powerhint.xml

diff --git a/config/holi/powerhint.xml b/config/holi/powerhint.xml
new file mode 100644
index 0000000..774e6da
--- /dev/null
+++ b/config/holi/powerhint.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!--
+/* Copyright (c) 2016-2018, 2020 The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *     * Neither the name of The Linux Foundation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-->
+<HintConfigs>
+    <Powerhint>
+
+        <!-- camera 30fps and camera preview -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+	<!--L CPU CORE 6 SCHED LOAD BOOST -->
+	<!--L CPU CORE 7 SCHED LOAD BOOST -->
+	<!--L CPU Hispeed freq of 1190Mhz -->
+	<!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+	<!--L CLUSTER_BIG - Set hispeed load 95 -->
+	<!--CPUBW HWMON - Set sample_ms 50 -->
+        <!--CPUBW HWMON - Set io_percent 100 -->
+        <!--CPUBW HWMON - Set up_scale 0 -->
+        <Config
+            Id="0x00001331" Enable="true" Timeout="0" Target="holi"
+            Resources="0x40C68100, -20, 0x40C68110, -20, 0x40C68120, -20,
+            0x40C68130, -20, 0x40C68000, -20, 0x40C68010, -20, 0x40C68020, -20, 0x40C68030, -20,
+            0x4143C100, 1190, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x32, 0x41808000, 0x64, 0x43014000, 0x0"/>
+
+
+        <!-- camera 60 FPS -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+	<!--L CPU CORE 6 SCHED LOAD BOOST -->
+	<!--L CPU CORE 7 SCHED LOAD BOOST -->
+	<!--L CPU Hispeed freq of 1190Mhz -->
+	<!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+	<!--L CLUSTER_BIG - Set hispeed load 95 -->
+	<!--CPUBW HWMON - Set sample_ms 20 -->
+        <Config
+            Id="0x00001332" Enable="true" Timeout="0" Target="holi"
+            Resources="0x40C68100, -25, 0x40C68110, -25, 0x40C68120, -25,
+            0x40C68130, -25, 0x40C68000, -25, 0x40C68010, -25, 0x40C68020, -25, 0x40C68030, -25,
+            0x4143C100, 1190, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14"/>
+
+
+        <!-- camera HFR -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+	<!--L CPU CORE 6 SCHED LOAD BOOST -->
+	<!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1190Mhz -->
+        <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+	<!--L CLUSTER_BIG - Set hispeed load 95 -->
+        <!--CPUBW HWMON - Set sample_ms 20 -->
+        <Config
+            Id="0x00001333" Enable="true" Timeout="0" Target="holi"
+            Resources="0x40C68100, -10, 0x40C68110, -10, 0x40C68120, -10,
+            0x40C68130, -10, 0x40C68000, -10, 0x40C68010, 10, 0x40C68020, -10, 0x40C68030, -10,
+            0x4143C100, 1190, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14"/>
+
+
+        <!-- HFR 480fps -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+	<!--L CPU CORE 6 SCHED LOAD BOOST -->
+	<!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1190Mhz -->
+        <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+	<!--L CLUSTER_BIG - Set hispeed load 95 -->
+        <!--CPUBW HWMON - Set sample_ms 20 -->
+        <Config
+            Id="0x00001334" Enable="true" Timeout="0" Target="holi"
+            Resources="0x40C68100, -10, 0x40C68110, -10, 0x40C68120, -10,
+            0x40C68130, -10, 0x40C68000, -10, 0x40C68010, -10, 0x40C68020, -10, 0x40C68030, -10,
+            0x4143C100, 1190, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14"/>
+
+
+        <!-- same settings for all the qvr power levels intentionally -->
+        <!-- qvr level cpu1 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.768 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.035 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.478 Ghz -->
+        <!-- GPU - min pwrlevel 6 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130A" Enable="true" Target="holi" Timeout="0"
+            Resources="0x40800000, 0x300, 0x40804000, 0x7F3, 0x40800100, 0x240, 0x40804100, 0x5C6,
+            0x42804000, 0x6, 0x42808000, 0x0"/>
+
+        <!-- qvr level cpu1 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.768 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.035 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.478 Ghz -->
+        <!-- GPU - min pwrlevel 6 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130B" Enable="true" Target="holi" Timeout="0"
+            Resources="0x40800000, 0x300, 0x40804000, 0x7F3, 0x40800100, 0x240, 0x40804100, 0x5C6,
+            0x42804000, 0x6, 0x42808000, 0x0"/>
+
+        <!-- qvr level cpu1 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.768 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.035 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.478 Ghz -->
+        <!-- GPU - min pwrlevel 6 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130C" Enable="true" Target="holi" Timeout="0"
+            Resources="0x40800000, 0x300, 0x40804000, 0x7F3, 0x40800100, 0x240, 0x40804100, 0x5C6,
+            0x42804000, 0x6, 0x42808000, 0x0"/>
+
+        <!-- qvr level cpu2 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.768 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.035 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.478 Ghz -->
+        <!-- GPU - min pwrlevel 6 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130D" Enable="true" Target="holi" Timeout="0"
+            Resources="0x40800000, 0x300, 0x40804000, 0x7F3, 0x40800100, 0x240, 0x40804100, 0x5C6,
+            0x42804000, 0x6, 0x42808000, 0x0"/>
+
+        <!-- qvr level cpu2 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.768 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.035 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.478 Ghz -->
+        <!-- GPU - min pwrlevel 6 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130E" Enable="true" Target="holi" Timeout="0"
+            Resources="0x40800000, 0x300, 0x40804000, 0x7F3, 0x40800100, 0x240, 0x40804100, 0x5C6,
+            0x42804000, 0x6, 0x42808000, 0x0"/>
+
+        <!-- qvr level cpu2 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.768 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.035 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.478 Ghz -->
+        <!-- GPU - min pwrlevel 6 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130F" Enable="true" Target="holi" Timeout="0"
+            Resources="0x40800000, 0x300, 0x40804000, 0x7F3, 0x40800100, 0x240, 0x40804100, 0x5C6,
+            0x42804000, 0x6, 0x42808000, 0x0"/>
+
+        <!-- qvr level cpu3 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.768 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.035 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.478 Ghz -->
+        <!-- GPU - min pwrlevel 6 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001310" Enable="true" Target="holi" Timeout="0"
+            Resources="0x40800000, 0x300, 0x40804000, 0x7F3, 0x40800100, 0x240, 0x40804100, 0x5C6,
+            0x42804000, 0x6, 0x42808000, 0x0"/>
+
+        <!-- qvr level cpu3 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.768 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.035 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.478 Ghz -->
+        <!-- GPU - min pwrlevel 6 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001311" Enable="true" Target="holi" Timeout="0"
+            Resources="0x40800000, 0x300, 0x40804000, 0x7F3, 0x40800100, 0x240, 0x40804100, 0x5C6,
+            0x42804000, 0x6, 0x42808000, 0x0"/>
+
+        <!-- qvr level cpu3 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.768 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.035 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.478 Ghz -->
+        <!-- GPU - min pwrlevel 6 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001312" Enable="true" Target="holi" Timeout="0"
+            Resources="0x40800000, 0x300, 0x40804000, 0x7F3, 0x40800100, 0x240, 0x40804100, 0x5C6,
+            0x42804000, 0x6, 0x42808000, 0x0"/>
+
+         <!-- sustained performance -->
+         <!-- B CPU - Cluster min freq uncapped -->
+         <!-- L CPU - Cluster min freq uncapped -->
+         <!-- B CPU - Cluster max freq ~1.22 GHz -->
+         <!-- L CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- GPU - min freq 275Mhz -->
+         <!-- GPU - max freq 400Mhz -->
+         <!-- GPUBW freq uncapped -->
+         <Config
+             Id="0x00001206" Enable="true" Timeout="0" Target="holi"
+             Resources="0x40800000, 0x0, 0x40800100, 0x0, 0x40804000, 0x4CC, 0x40804100, 0x4CC,
+             0X4280C000, 0x113, 0X42810000, 0x190, 0x42814000, 0x0"/>
+
+         <!-- vr mode -->
+         <!-- B CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster min freq ~0.940 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.90 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.70 Ghz -->
+         <!-- GPU - min freq 275Mhz -->
+         <!-- GPU - max freq 625Mhz -->
+         <!-- GPUBW uncapped -->
+         <Config
+             Id="0x00001207" Enable="true" Timeout="0" Target="holi"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x3AC, 0x40804000, 0x76C, 0x40804100, 0x6C0,
+             0X4280C000, 0x113, 0X4280C000, 0x271, 0x42814000, 0x0"/>
+
+         <!-- vr mode sustained performance -->
+         <!-- B CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- GPU - min freq 400Mhz -->
+         <!-- GPU - max freq 400Mhz -->
+         <!-- GPUBW uncapped  -->
+         <Config
+             Id="0x00001301" Enable="true" Timeout="0" Target="holi"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x4CC, 0x40804000, 0x4CC, 0x40804100, 0x4CC,
+             0X4280C000, 0x190, 0X42810000, 0x190, 0x42814000, 0x0"/>
+
+    </Powerhint>
+</HintConfigs>
+
+
+
diff --git a/power-vendor-product.mk b/power-vendor-product.mk
index b957116..a06869c 100644
--- a/power-vendor-product.mk
+++ b/power-vendor-product.mk
@@ -13,4 +13,6 @@ else ifeq ($(TARGET_BOARD_PLATFORM),atoll)
 PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/atoll/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
 else ifeq ($(TARGET_BOARD_PLATFORM),lahaina)
 PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/lahaina/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
+else ifeq ($(TARGET_BOARD_PLATFORM),holi)
+PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/holi/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
 endif

From 95e10ea07d617cab89cd9515a95c6bc91ae19f06 Mon Sep 17 00:00:00 2001
From: Rajashekar Adi <radi@codeaurora.org>
Date: Wed, 9 Sep 2020 16:14:29 +0530
Subject: [PATCH 3/5] Power: Update powerhint for cedros

Add powerhint for camera cases for cedros

Change-Id: Ie184ac66e059d2633032781b2774a25453a0b322
---
 config/lahaina/powerhint.xml | 278 +++++++++++++++++++++++++++++++++++
 1 file changed, 278 insertions(+)

diff --git a/config/lahaina/powerhint.xml b/config/lahaina/powerhint.xml
index 3494f6f..26d27d9 100644
--- a/config/lahaina/powerhint.xml
+++ b/config/lahaina/powerhint.xml
@@ -232,5 +232,283 @@
         <Config
             Id="0x00001334" Enable="true" Timeout="0" Target="lahaina"
             Resources="0x40400000, 0x1, 0x40800100, 0x40C, 0x40800000, 0x4CC, 0x40C20000, 0x14, 0x40C1C000, 0x1E, 0x41820000, 0x0A, 0x41808000, 0x50, 0x4180C000, 0"/>
+
+        <!-- camera 30fps and camera preview -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 864Mhz -->
+        <!--L CPU - Set hispeed load 95 -->
+        <!--CPU-LLCC BWMON - Set sample_ms 20 -->
+        <!--LLCC-DDR BWMON - Set sample_ms 20 -->
+        <Config
+            Id="0x00001331" Enable="true" Timeout="0" Target="shima"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4143C100, 940, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- camera 60 FPS -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set sample_ms 20 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <Config
+            Id="0x00001332" Enable="true" Timeout="0" Target="shima"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- camera HFR -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set sample_ms 20 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <Config
+            Id="0x00001333" Enable="true" Timeout="0" Target="shima"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+
+        <!-- HFR 480fps -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set sample_ms 20 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <!--CPU CORE 0 Min freq to 1.075Ghz -->
+        <Config
+            Id="0x00001334" Enable="true" Timeout="0" Target="shima"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 0x433"/>
+
+
+        <!-- same settings for all the qvr power levels intentionally -->
+        <!-- qvr level cpu1 gpu1 -->
+        <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
+        <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
+        <!-- B CPU - Cluster min freq ~.652 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~.614 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130A" Enable="true" Target="shima" Timeout="0"
+            Resources="0x40800200, 0x326, 0x40804200, 0x960, 0x40800000, 0x28C,
+            0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+
+        <!-- qvr level cpu1 gpu2 -->
+        <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
+        <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
+        <!-- B CPU - Cluster min freq ~.652 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~.614 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130B" Enable="true" Target="shima" Timeout="0"
+            Resources="0x40800200, 0x326, 0x40804200, 0x960, 0x40800000, 0x28C,
+            0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+
+        <!-- qvr level cpu1 gpu3 -->
+        <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
+        <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
+        <!-- B CPU - Cluster min freq ~.652 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~.614 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130C" Enable="true" Target="shima" Timeout="0"
+            Resources="0x40800200, 0x326, 0x40804200, 0x960, 0x40800000, 0x28C,
+            0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+
+        <!-- qvr level cpu2 gpu1 -->
+        <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
+        <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
+        <!-- B CPU - Cluster min freq ~.652 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~.614 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130D" Enable="true" Target="shima" Timeout="0"
+            Resources="0x40800200, 0x326, 0x40804200, 0x960, 0x40800000, 0x28C,
+            0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+
+        <!-- qvr level cpu2 gpu2 -->
+        <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
+        <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
+        <!-- B CPU - Cluster min freq ~.652 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~.614 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130E" Enable="true" Target="shima" Timeout="0"
+            Resources="0x40800200, 0x326, 0x40804200, 0x960, 0x40800000, 0x28C,
+            0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+
+        <!-- qvr level cpu2 gpu3 -->
+        <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
+        <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
+        <!-- B CPU - Cluster min freq ~.652 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~.614 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130F" Enable="true" Target="shima" Timeout="0"
+            Resources="0x40800200, 0x326, 0x40804200, 0x960, 0x40800000, 0x28C,
+            0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu3 gpu1 -->
+        <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
+        <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
+        <!-- B CPU - Cluster min freq ~.652 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~.614 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001310" Enable="true" Target="shima" Timeout="0"
+            Resources="0x40800200, 0x326, 0x40804200, 0x960, 0x40800000, 0x28C,
+            0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+
+        <!-- qvr level cpu3 gpu2 -->
+        <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
+        <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
+        <!-- B CPU - Cluster min freq ~.652 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~.614 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001311" Enable="true" Target="shima" Timeout="0"
+            Resources="0x40800200, 0x326, 0x40804200, 0x960, 0x40800000, 0x28C,
+            0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+
+        <!-- qvr level cpu3 gpu3 -->
+        <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
+        <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
+        <!-- B CPU - Cluster min freq ~.652 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.092 Ghz -->
+        <!-- L CPU - Cluster min freq ~.614 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001312" Enable="true" Target="shima" Timeout="0"
+            Resources="0x40800200, 0x326, 0x40804200, 0x960, 0x40800000, 0x28C,
+            0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+
+         <!-- sustained performance -->
+         <!-- Prime CPU - Cluster min freq uncapped -->
+         <!-- B CPU - Cluster min freq uncapped -->
+         <!-- L CPU - Cluster min freq uncapped -->
+         <!-- Prime CPU - Cluster max freq ~1.094 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.152 GHz -->
+         <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+         <!-- GPU - min freq 275Mhz -->
+         <!-- GPU - max freq 400Mhz -->
+         <!-- GPUBW freq uncapped -->
+         <Config
+             Id="0x00001206" Enable="true" Timeout="0" Target="shima"
+             Resources="0x40800200, 0x0, 0x40800000, 0x0, 0x40800100, 0x0, 0x40804200, 0x446,
+             0x40804000, 0x480, 0x40804100, 0x433, 0X4280C000, 0x113, 0X42810000, 0x190,
+             0x42814000, 0x0"/>
+
+
+         <!-- vr mode -->
+         <!-- Prime CPU - Cluster min freq ~1.094 Ghz -->
+         <!-- B CPU - Cluster min freq ~1.152 Ghz -->
+         <!-- L CPU - Cluster min freq ~0.864 Ghz -->
+         <!-- Prime CPU - Cluster max freq ~2.188 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.90 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.651 Ghz -->
+         <!-- GPU - min freq 275Mhz -->
+         <!-- GPU - max freq 625Mhz -->
+         <!-- GPUBW uncapped -->
+         <Config
+             Id="0x00001207" Enable="true" Timeout="0" Target="shima"
+             Resources="0x40800200, 0x446, 0x40800000, 0x480, 0x40800100, 0x360, 0x40804200, 0x88C,
+             0x40804000, 0x76C, 0x40804100, 0x673, 0X4280C000, 0x113, 0X4280C000, 0x271,
+             0x42814000, 0x0"/>
+
+
+         <!-- vr mode sustained performance -->
+         <!-- Prime CPU - Cluster min freq ~1.094 Ghz -->
+         <!-- B CPU - Cluster min freq ~1.152 Ghz -->
+         <!-- L CPU - Cluster min freq ~1.075 Ghz -->
+         <!-- Prime CPU - Cluster max freq ~1.094 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.152 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.075 Ghz -->
+         <!-- GPU - min freq 400Mhz -->
+         <!-- GPU - max freq 400Mhz -->
+         <!-- GPUBW uncapped  -->
+         <Config
+             Id="0x00001301" Enable="true" Timeout="0" Target="shima"
+             Resources="0x40800200, 0x446, 0x40800000, 0x480, 0x40800100, 0x433, 0x40804200, 0x446,
+             0x40804000, 0x480, 0x40804100, 0x433, 0X4280C000, 0x190, 0X42810000, 0x190,
+             0x42814000, 0x0"/>
+
     </Powerhint>
 </HintConfigs>

From ea7deb3bb97999566dbe2fc4744f6ca2aa1c2e98 Mon Sep 17 00:00:00 2001
From: Ananth Raghavan Subramanian <sananth@codeaurora.org>
Date: Fri, 7 Aug 2020 11:47:53 -0700
Subject: [PATCH 4/5] lahaina: Correct powerhint for camera

Modified the powerhint for the general camera use-cases and added 60FPS,
8k30, HFR hints.

Change-Id: Ide5be13c84a06d0ebd76d3dc13cdac0360ad8e93
---
 config/lahaina/powerhint.xml | 64 +++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 8 deletions(-)

diff --git a/config/lahaina/powerhint.xml b/config/lahaina/powerhint.xml
index 26d27d9..180793b 100644
--- a/config/lahaina/powerhint.xml
+++ b/config/lahaina/powerhint.xml
@@ -204,21 +204,69 @@
             Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
             0x42804000, 0x0, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
 
-        <!--camera general-->
-        <!--CPU-LLC BWMON - Set sample_ms 16 -->
-        <!--CPU-LLC BWMON - Set io_percent 80 -->
-        <!--CPU-LLC BWMON - Set hyst_length hyst_trigger hist memory 0 -->
+        <!--camera ZSLPreview>
+        <!--CPU-LLC BWMON - Set sample_ms 33 -->
+        <!--CPU-LLC BWMON - Set io_percent 100 -->
+        <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
+		<!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
+        <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
+        <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
+        <!--L CPU - Disable schedutil PL -->
+        <!--L CPU - Set hispeed load 99 -->
+		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
+		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 -- - no resource id yet-->
+        <Config
+            Id="0x00001330" Enable="true" Timeout="0" Target="lahaina"
+            Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8"/>
+
+
+        <!--camera 30fps>
+        <!--CPU-LLC BWMON - Set sample_ms 33 -->
+        <!--CPU-LLC BWMON - Set io_percent 100 -->
+        <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
+		<!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
+        <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
+        <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
+		<!--L CPU min freq 998400 -->
+        <!--L CPU - Disable schedutil PL -->
+        <!--L CPU - Set hispeed load 99 -->
+		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
+		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 -- - no resource id yet-->
         <Config
             Id="0x00001331" Enable="true" Timeout="0" Target="lahaina"
-            Resources="0x41820000, 0x10, 0x41808000, 0x50, 0x4180C000, 0"/>
+            Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x3E6, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8"/>
 
         <!--camera 60fps-->
         <!--CPU-LLC BWMON - Set sample_ms 16 -->
-        <!--CPU-LLC BWMON - Set io_percent 80 -->
-        <!--CPU-LLC BWMON - Set hyst_length hyst_trigger hist memory 0 -->
+        <!--CPU-LLC BWMON - Set io_percent 100 -->
+        <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
+		<!--CPU-LLC-DDR BWMON - Set sample_ms 16 -->
+        <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
+        <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
+		<!--L CPU min freq 1209600 -->
+        <!--L CPU - Disable schedutil PL -->
+        <!--L CPU - Set hispeed load 99 -->
+		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
+		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 -- - no resource id yet-->
         <Config
             Id="0x00001332" Enable="true" Timeout="0" Target="lahaina"
-            Resources="0x41820000, 0x10, 0x41808000, 0x50, 0x4180C000, 0"/>
+            Resources="0x41820000, 0x10, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x10, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x4B9, 0x41444100, 0, 0x41440100, 0x63, 0x43420000, 0xC8"/>
+
+        <!--camera 8k30-->
+        <!--CPU-LLC BWMON - Set sample_ms 33 -->
+        <!--CPU-LLC BWMON - Set io_percent 100 -->
+        <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
+		<!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
+        <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
+        <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
+		<!--L CPU min freq 1209600 -->
+        <!--L CPU - Disable schedutil PL -->
+        <!--L CPU - Set hispeed load 99 -->
+		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
+		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 -- - no resource id yet-->
+        <Config
+            Id="0x00001335" Enable="true" Timeout="0" Target="lahaina"
+            Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x4B9, 0x41444100, 0, 0x41440100, 0x63, 0x43420000, 0xC8"/>
 
         <!--video encode HFR 480 fps-->
         <!--MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1-->

From c28b904053d70e477beb6bbd58cc8bd9e3c4cd34 Mon Sep 17 00:00:00 2001
From: Ananth Raghavan Subramanian <sananth@codeaurora.org>
Date: Tue, 15 Sep 2020 08:29:35 -0700
Subject: [PATCH 5/5] lahaina: Fix comments in powerhint.xml

Fixing syntax in powerhint.xml comments.
---
 config/lahaina/powerhint.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/lahaina/powerhint.xml b/config/lahaina/powerhint.xml
index 180793b..59a0469 100644
--- a/config/lahaina/powerhint.xml
+++ b/config/lahaina/powerhint.xml
@@ -204,8 +204,8 @@
             Resources="0x40800000, 0x386, 0x40804000, 0x82C, 0x40800100, 0x253, 0x40804100, 0x506, 0x40800200, 0x399, 0x40804200, 0x840,
             0x42804000, 0x0, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
 
-        <!--camera ZSLPreview>
-        <!--CPU-LLC BWMON - Set sample_ms 33 -->
+        <!--camera ZSLPreview-->
+        <!--CPU-LLC BWMON - Set sample_ms 33-->
         <!--CPU-LLC BWMON - Set io_percent 100 -->
         <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
 		<!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
@@ -214,13 +214,13 @@
         <!--L CPU - Disable schedutil PL -->
         <!--L CPU - Set hispeed load 99 -->
 		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
-		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 -- - no resource id yet-->
+		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
         <Config
             Id="0x00001330" Enable="true" Timeout="0" Target="lahaina"
             Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8"/>
 
 
-        <!--camera 30fps>
+        <!--camera 30fps-->
         <!--CPU-LLC BWMON - Set sample_ms 33 -->
         <!--CPU-LLC BWMON - Set io_percent 100 -->
         <!--CPU-LLC BWMON - Set hyst_length hist memory 0 -->
@@ -231,7 +231,7 @@
         <!--L CPU - Disable schedutil PL -->
         <!--L CPU - Set hispeed load 99 -->
 		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
-		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 -- - no resource id yet-->
+		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
         <Config
             Id="0x00001331" Enable="true" Timeout="0" Target="lahaina"
             Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x3E6, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8"/>
@@ -247,7 +247,7 @@
         <!--L CPU - Disable schedutil PL -->
         <!--L CPU - Set hispeed load 99 -->
 		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
-		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 -- - no resource id yet-->
+		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
         <Config
             Id="0x00001332" Enable="true" Timeout="0" Target="lahaina"
             Resources="0x41820000, 0x10, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x10, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x4B9, 0x41444100, 0, 0x41440100, 0x63, 0x43420000, 0xC8"/>
@@ -263,7 +263,7 @@
         <!--L CPU - Disable schedutil PL -->
         <!--L CPU - Set hispeed load 99 -->
 		<!--CPU0-LLC MEM LAT - Set ratio_ceil 200 -->
-		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 -- - no resource id yet-->
+		<!--CPU0-LLC-DDR MEM LAT - Set ratio_ceil 200 - no resource id yet-->
         <Config
             Id="0x00001335" Enable="true" Timeout="0" Target="lahaina"
             Resources="0x41820000, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x4B9, 0x41444100, 0, 0x41440100, 0x63, 0x43420000, 0xC8"/>