From e6dd37f1a33a7606c7b479e2e9a59ca0aa541cf2 Mon Sep 17 00:00:00 2001
From: Rajeswari N <rajin@codeaurora.org>
Date: Mon, 8 Mar 2021 19:29:19 +0530
Subject: [PATCH 1/2] power: Update powerhint for yupik

Update powerhint for 30fps, 60fps encode cases

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

diff --git a/config/lahaina/powerhint.xml b/config/lahaina/powerhint.xml
index 7741828..f5576a6 100644
--- a/config/lahaina/powerhint.xml
+++ b/config/lahaina/powerhint.xml
@@ -577,10 +577,12 @@
         <!--L CPU - Set hispeed load 95 -->
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample_ms 20 -->
+        <!--Sched downmigrate/group_downmigrate 40, Upmigrate/group_upmigrate 45 -->
         <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"/>
+            0x40C68130, 0xFFFFFFFA, 0x4143C100, 940, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000, 
+            0x14, 0x40C58000, 40, 0x40C54000, 45, 0x40C20000, 40, 0x40C1C000, 45"/>
 
         <!-- camera 30fps encode -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -592,11 +594,13 @@
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample_ms 20 -->
         <!--L CPU Min Freq 940, Max Freq 1804 -->
+        <!--Sched downmigrate/group_downmigrate 40, Upmigrate/group_upmigrate 45 -->
         <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"/>
+            0x40C68130, 0xFFFFFFFA, 0x4143C100, 940, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000,
+            0x14, 0x40800100, 940, 0x40804100, 1804, 0x40C58000, 40, 0x40C54000, 45, 0x40C20000, 40,
+            0x40C1C000, 45"/>
 
         <!-- camera 60 FPS -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -605,10 +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 -->
         <Config
             Id="0x00001332" Enable="true" Timeout="0" Target="yupik"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
-            0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14"/>
+            0x40C68130, 0xFFFFFFFA, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40C58000, 40, 0x40C54000, 45,
+            0x40C20000, 40, 0x40C1C000, 45"/>
 
         <!-- camera HFR -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -618,10 +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 -->
         <Config
             Id="0x00001333" 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, 0x40C58000, 40,
+            0x40C54000, 45, 0x40C20000, 40, 0x40C1C000, 45"/>
 
         <!-- HFR 480fps -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->

From b82d7371b51735bf298d7070ce9bab6564b72873 Mon Sep 17 00:00:00 2001
From: Divya Sharma <divyash@codeaurora.org>
Date: Wed, 3 Mar 2021 14:25:53 -0800
Subject: [PATCH 2/2] 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