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/3] 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/3] 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/3] 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