From fe5c39c5d2a34bc5c45798885e615b4c5a4337d2 Mon Sep 17 00:00:00 2001
From: Divya Sharma <divyash@codeaurora.org>
Date: Wed, 3 Mar 2021 14:25:53 -0800
Subject: [PATCH 1/6] Specify stable AIDL version number.

Bug: 181709127
Change-Id: I1132378f14428bf511f3cea4f419e90a6e89f823
---
 Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 84b9e54..f2ef2b6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,8 @@ ifeq ($(call is-vendor-board-platform,QCOM),true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-ndk_platform libbinder_ndk
+# KEYSTONE(I1132378f14428bf511f3cea4f419e90a6e89f823,b/181709127)
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-V1-ndk_platform libbinder_ndk
 LOCAL_HEADER_LIBRARIES += libutils_headers
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_SRC_FILES := power-common.c metadata-parser.c utils.c list.c hint-data.c powerhintparser.c Power.cpp main.cpp

From 8bf7cbcdb279d21594f00754c11ac26337018819 Mon Sep 17 00:00:00 2001
From: Rajeswari N <rajin@codeaurora.org>
Date: Mon, 22 Mar 2021 17:37:26 +0530
Subject: [PATCH 2/6] power: update powerhint for yupik

Update powerhint for camera 60fps and HFR cases

Change-Id: I88b464d276be1bf30b3cecadf0ec6c88d27db998
---
 config/lahaina/powerhint.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/lahaina/powerhint.xml b/config/lahaina/powerhint.xml
index f5576a6..c2b0892 100644
--- a/config/lahaina/powerhint.xml
+++ b/config/lahaina/powerhint.xml
@@ -609,12 +609,12 @@
         <!--L CPU CORE 3 SCHED LOAD BOOST -->
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample ms 20 -->
-        <!--Sched downmigrate/group_downmigrate 40, Upmigrate/group_upmigrate 45 -->
+        <!--Sched downmigrate/group_downmigrate 30, Upmigrate/group_upmigrate 35 -->
         <Config
             Id="0x00001332" Enable="true" Timeout="0" Target="yupik"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40C58000, 40, 0x40C54000, 45,
-            0x40C20000, 40, 0x40C1C000, 45"/>
+            0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40C58000, 30, 0x40C54000, 35,
+            0x40C20000, 30, 0x40C1C000, 35"/>
 
         <!-- camera HFR -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -624,12 +624,12 @@
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample ms 20 -->
         <!--CPU CORE 0 Min freq to 1.152Ghz -->
-        <!--Sched downmigrate/group_downmigrate 40, Upmigrate/group_upmigrate 45 -->
+        <!--Sched downmigrate/group_downmigrate 30, Upmigrate/group_upmigrate 35 -->
         <Config
             Id="0x00001333" Enable="true" Timeout="0" Target="yupik"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 0x480, 0x40C58000, 40,
-            0x40C54000, 45, 0x40C20000, 40, 0x40C1C000, 45"/>
+            0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 0x480, 0x40C58000, 30,
+            0x40C54000, 35, 0x40C20000, 30, 0x40C1C000, 35"/>
 
         <!-- HFR 480fps -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->

From ffe56b05656bbf0530e2cad3f45d250eb58502e5 Mon Sep 17 00:00:00 2001
From: Deevana Murthy Bandaru <dbandaru@codeaurora.org>
Date: Mon, 19 Apr 2021 12:18:53 +0530
Subject: [PATCH 3/6] Revert "Specify stable AIDL version number."

This reverts commit fe5c39c5d2a34bc5c45798885e615b4c5a4337d2.

Change-Id: Ib7cf4760a2a62e7bb2dd4527004588c26850e433
---
 Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index f2ef2b6..84b9e54 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,8 +7,7 @@ ifeq ($(call is-vendor-board-platform,QCOM),true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_RELATIVE_PATH := hw
-# KEYSTONE(I1132378f14428bf511f3cea4f419e90a6e89f823,b/181709127)
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-V1-ndk_platform libbinder_ndk
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-ndk_platform libbinder_ndk
 LOCAL_HEADER_LIBRARIES += libutils_headers
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_SRC_FILES := power-common.c metadata-parser.c utils.c list.c hint-data.c powerhintparser.c Power.cpp main.cpp

From 88a9668e11d7ebdaa5420b97474981bcbf2c0f9a Mon Sep 17 00:00:00 2001
From: Sumit Gemini <sgemini@codeaurora.org>
Date: Wed, 26 May 2021 14:52:53 +0530
Subject: [PATCH 4/6] power: update powerhint for yupik
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Camera threads which are comes under Foreground tasks.
Enabling schedtune.prefer_idle for FG tasks during camera use cases helping
to wake up the task on IDLE CPU’s will help to reduce the runnables which
will benefit customers to achieve FPS.
---
 config/lahaina/powerhint.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/config/lahaina/powerhint.xml b/config/lahaina/powerhint.xml
index c2b0892..d505585 100644
--- a/config/lahaina/powerhint.xml
+++ b/config/lahaina/powerhint.xml
@@ -578,11 +578,12 @@
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample_ms 20 -->
         <!--Sched downmigrate/group_downmigrate 40, Upmigrate/group_upmigrate 45 -->
+        <!--Set uclamp latency sensitivity to 1 -->
         <Config
             Id="0x00001330" Enable="true" Timeout="0" Target="yupik"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x4143C100, 940, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000, 
-            0x14, 0x40C58000, 40, 0x40C54000, 45, 0x40C20000, 40, 0x40C1C000, 45"/>
+            0x14, 0x40C58000, 40, 0x40C54000, 45, 0x40C20000, 40, 0x40C1C000, 45, 0x40CEC000, 0x1"/>
 
         <!-- camera 30fps encode -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -595,12 +596,13 @@
         <!--LLCC-DDR BWMON - Set sample_ms 20 -->
         <!--L CPU Min Freq 940, Max Freq 1804 -->
         <!--Sched downmigrate/group_downmigrate 40, Upmigrate/group_upmigrate 45 -->
+        <!--Set uclamp latency sensitivity to 1 -->
         <Config
             Id="0x00001331" Enable="true" Timeout="0" Target="yupik"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x4143C100, 940, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000,
             0x14, 0x40800100, 940, 0x40804100, 1804, 0x40C58000, 40, 0x40C54000, 45, 0x40C20000, 40,
-            0x40C1C000, 45"/>
+            0x40C1C000, 45, 0x40CEC000, 0x1"/>
 
         <!-- camera 60 FPS -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -610,11 +612,12 @@
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample ms 20 -->
         <!--Sched downmigrate/group_downmigrate 30, Upmigrate/group_upmigrate 35 -->
+        <!--Set uclamp latency sensitivity to 1 -->
         <Config
             Id="0x00001332" Enable="true" Timeout="0" Target="yupik"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40C58000, 30, 0x40C54000, 35,
-            0x40C20000, 30, 0x40C1C000, 35"/>
+            0x40C20000, 30, 0x40C1C000, 35, 0x40CEC000, 0x1"/>
 
         <!-- camera HFR -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -625,11 +628,12 @@
         <!--LLCC-DDR BWMON - Set sample ms 20 -->
         <!--CPU CORE 0 Min freq to 1.152Ghz -->
         <!--Sched downmigrate/group_downmigrate 30, Upmigrate/group_upmigrate 35 -->
+        <!--Set uclamp latency sensitivity to 1 -->
         <Config
             Id="0x00001333" Enable="true" Timeout="0" Target="yupik"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 0x480, 0x40C58000, 30,
-            0x40C54000, 35, 0x40C20000, 30, 0x40C1C000, 35"/>
+            0x40C54000, 35, 0x40C20000, 30, 0x40C1C000, 35, 0x40CEC000, 0x1"/>
 
         <!-- HFR 480fps -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -639,10 +643,11 @@
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample ms 20 -->
         <!--CPU CORE 0 Min freq to 1.152Ghz -->
+        <!--Set uclamp latency sensitivity to 1 -->
         <Config
             Id="0x00001334" Enable="true" Timeout="0" Target="yupik"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 0x480"/>
+            0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 0x480, 0x40CEC000, 0x1"/>
 
         <!-- multi camera 30fps-->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -653,11 +658,12 @@
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample_ms 20 -->
         <!--L CPU Min Freq 940, Max Freq 1804 -->
+        <!--Set uclamp latency sensitivity to 1 -->
         <Config
             Id="0x00001336" Enable="true" Timeout="0" Target="yupik"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x4143C100, 940, 0x4183C000, 0x14, 0x43034000, 0x14,
-            0x40800100, 940, 0x40804100, 1804"/>
+            0x40800100, 940, 0x40804100, 1804, 0x40CEC000, 0x1"/>
 
         <!-- same settings for all the qvr power levels intentionally -->
         <!-- qvr level cpu1 gpu1 -->

From 4f8416ac3f74cb1760066f2d2408cb84be778a27 Mon Sep 17 00:00:00 2001
From: Deevana Murthy Bandaru <dbandaru@codeaurora.org>
Date: Wed, 21 Apr 2021 14:56:09 +0530
Subject: [PATCH 5/6] power: Adding support for video hints

Added support for video 240fps case.

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

diff --git a/config/lahaina/powerhint.xml b/config/lahaina/powerhint.xml
index d505585..8bb63d8 100644
--- a/config/lahaina/powerhint.xml
+++ b/config/lahaina/powerhint.xml
@@ -36,6 +36,11 @@
             Id="0x00001203" Enable="true" Target="lahaina"
             Resources="" />
 
+        <!--video decode 240fps-->
+        <Config
+            Id="0x00001501" Enable="true" Target="lahaina" Timeout="0"
+            Resources="0x43010000, 59" />
+
         <!--sustained performance-->
         <Config
             Id="0x00001206" Enable="true" Target="lahaina"

From 6b812f0f55c691386ea6f30f6b5bcbef2b8ef0a0 Mon Sep 17 00:00:00 2001
From: Divya Sharma <divyash@codeaurora.org>
Date: Wed, 3 Mar 2021 14:25:53 -0800
Subject: [PATCH 6/6] Specify stable AIDL version number.

Bug: 181709127
Change-Id: I1132378f14428bf511f3cea4f419e90a6e89f823
---
 Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 84b9e54..f2ef2b6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,8 @@ ifeq ($(call is-vendor-board-platform,QCOM),true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-ndk_platform libbinder_ndk
+# KEYSTONE(I1132378f14428bf511f3cea4f419e90a6e89f823,b/181709127)
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-V1-ndk_platform libbinder_ndk
 LOCAL_HEADER_LIBRARIES += libutils_headers
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_SRC_FILES := power-common.c metadata-parser.c utils.c list.c hint-data.c powerhintparser.c Power.cpp main.cpp