Merge 91d7a050881b1df204a889061a7f10ca924b3a67 on remote branch
Change-Id: I18768864c33955d0e123850620f6bc7cb2039de6
diff --git a/config/anorak/powerhint.xml b/config/anorak/powerhint.xml
index dbb71ed..355840a 100644
--- a/config/anorak/powerhint.xml
+++ b/config/anorak/powerhint.xml
@@ -88,14 +88,14 @@
<!-- P CPU - PRIME CPU min freq ~.691 Ghz-->
<!-- P CPU - PRIME CPU max freq ~1.9 Ghz -->
<!-- GPU - min pwrlevel 5 (freq 285 Mhz) -->
- <!-- GPU - max pwrlevel 5 (freq 285 Mhz) -->
+ <!-- GPU - max pwrlevel 0 (freq 681 Mhz) -->
<!-- Min Big CPUs 3 -->
<!-- Min Prime CPUs 1 -->
<!-- Indefinite Duration -->
<Config
Id="0x0000130A" Enable="true" Target="anorak" Timeout="0"
Resources="0x40800000, 0x2B3, 0x40804000, 0x780, 0x40800100, 0x253, 0x40804100, 0x506,
- 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x5, 0x41000000, 0x3,
+ 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3,
0x41000200, 0x1"/>
<!-- qvr level cpu1 gpu2 -->
@@ -106,14 +106,14 @@
<!-- P CPU - PRIME CPU min freq ~.691 Ghz-->
<!-- P CPU - PRIME CPU max freq ~1.9 Ghz -->
<!-- GPU - min pwrlevel 5 (freq 285 Mhz) -->
- <!-- GPU - max pwrlevel 5 (freq 285 Mhz) -->
+ <!-- GPU - max pwrlevel 0 (freq 681 Mhz) -->
<!-- Min Big CPUs 3 -->
<!-- Min Prime CPUs 1 -->
<!-- Indefinite Duration -->
<Config
Id="0x0000130B" Enable="true" Target="anorak" Timeout="0"
Resources="0x40800000, 0x2B3, 0x40804000, 0x780, 0x40800100, 0x253, 0x40804100, 0x506,
- 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x5, 0x41000000, 0x3,
+ 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3,
0x41000200, 0x1"/>
<!-- qvr level cpu1 gpu3 -->
@@ -124,14 +124,14 @@
<!-- P CPU - PRIME CPU min freq ~.691 Ghz-->
<!-- P CPU - PRIME CPU max freq ~1.9 Ghz -->
<!-- GPU - min pwrlevel 5 (freq 285 Mhz) -->
- <!-- GPU - max pwrlevel 5 (freq 285 Mhz) -->
+ <!-- GPU - max pwrlevel 0 (freq 681 Mhz) -->
<!-- Min Big CPUs 3 -->
<!-- Min Prime CPUs 1 -->
<!-- Indefinite Duration -->
<Config
Id="0x0000130C" Enable="true" Target="anorak" Timeout="0"
Resources="0x40800000, 0x2B3, 0x40804000, 0x780, 0x40800100, 0x253, 0x40804100, 0x506,
- 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x5, 0x41000000, 0x3,
+ 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3,
0x41000200, 0x1"/>
<!-- qvr level cpu2 gpu1 -->
@@ -142,14 +142,14 @@
<!-- P CPU - PRIME CPU min freq ~.691 Ghz-->
<!-- P CPU - PRIME CPU max freq ~1.9 Ghz -->
<!-- GPU - min pwrlevel 5 (freq 285 Mhz) -->
- <!-- GPU - max pwrlevel 5 (freq 285 Mhz) -->
+ <!-- GPU - max pwrlevel 0 (freq 681 Mhz) -->
<!-- Min Big CPUs 3 -->
<!-- Min Prime CPUs 1 -->
<!-- Indefinite Duration -->
<Config
Id="0x0000130D" Enable="true" Target="anorak" Timeout="0"
Resources="0x40800000, 0x2B3, 0x40804000, 0x780, 0x40800100, 0x253, 0x40804100, 0x506,
- 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x5, 0x41000000, 0x3,
+ 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3,
0x41000200, 0x1"/>
<!-- qvr level cpu2 gpu2 -->
@@ -160,14 +160,14 @@
<!-- P CPU - PRIME CPU min freq ~.691 Ghz-->
<!-- P CPU - PRIME CPU max freq ~1.9 Ghz -->
<!-- GPU - min pwrlevel 5 (freq 285 Mhz) -->
- <!-- GPU - max pwrlevel 5 (freq 285 Mhz) -->
+ <!-- GPU - max pwrlevel 0 (freq 681 Mhz) -->
<!-- Min Big CPUs 3 -->
<!-- Min Prime CPUs 1 -->
<!-- Indefinite Duration -->
<Config
Id="0x0000130E" Enable="true" Target="anorak" Timeout="0"
Resources="0x40800000, 0x2B3, 0x40804000, 0x780, 0x40800100, 0x253, 0x40804100, 0x506,
- 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x5, 0x41000000, 0x3,
+ 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3,
0x41000200, 0x1"/>
<!-- qvr level cpu2 gpu3 -->
@@ -178,14 +178,14 @@
<!-- P CPU - PRIME CPU min freq ~.691 Ghz-->
<!-- P CPU - PRIME CPU max freq ~1.9 Ghz -->
<!-- GPU - min pwrlevel 5 (freq 285 Mhz) -->
- <!-- GPU - max pwrlevel 5 (freq 285 Mhz) -->
+ <!-- GPU - max pwrlevel 0 (freq 681 Mhz) -->
<!-- Min Big CPUs 3 -->
<!-- Min Prime CPUs 1 -->
<!-- Indefinite Duration -->
<Config
Id="0x0000130F" Enable="true" Target="anorak" Timeout="0"
Resources="0x40800000, 0x2B3, 0x40804000, 0x780, 0x40800100, 0x253, 0x40804100, 0x506,
- 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x5, 0x41000000, 0x3,
+ 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3,
0x41000200, 0x1"/>
<!-- qvr level cpu3 gpu1 -->
@@ -196,14 +196,14 @@
<!-- P CPU - PRIME CPU min freq ~.691 Ghz-->
<!-- P CPU - PRIME CPU max freq ~1.9 Ghz -->
<!-- GPU - min pwrlevel 5 (freq 285 Mhz) -->
- <!-- GPU - max pwrlevel 5 (freq 285 Mhz) -->
+ <!-- GPU - max pwrlevel 0 (freq 681 Mhz) -->
<!-- Min Big CPUs 3 -->
<!-- Min Prime CPUs 1 -->
<!-- Indefinite Duration -->
<Config
Id="0x00001310" Enable="true" Target="anorak" Timeout="0"
Resources="0x40800000, 0x2B3, 0x40804000, 0x780, 0x40800100, 0x253, 0x40804100, 0x506,
- 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x5, 0x41000000, 0x3,
+ 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3,
0x41000200, 0x1"/>
<!-- qvr level cpu3 gpu2 -->
@@ -214,14 +214,14 @@
<!-- P CPU - PRIME CPU min freq ~.691 Ghz-->
<!-- P CPU - PRIME CPU max freq ~1.9 Ghz -->
<!-- GPU - min pwrlevel 5 (freq 285 Mhz) -->
- <!-- GPU - max pwrlevel 5 (freq 285 Mhz) -->
+ <!-- GPU - max pwrlevel 0 (freq 681 Mhz) -->
<!-- Min Big CPUs 3 -->
<!-- Min Prime CPUs 1 -->
<!-- Indefinite Duration -->
<Config
Id="0x00001311" Enable="true" Target="anorak" Timeout="0"
Resources="0x40800000, 0x2B3, 0x40804000, 0x780, 0x40800100, 0x253, 0x40804100, 0x506,
- 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x5, 0x41000000, 0x3,
+ 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3,
0x41000200, 0x1"/>
<!-- qvr level cpu3 gpu3 -->
@@ -232,14 +232,14 @@
<!-- P CPU - PRIME CPU min freq ~.691 Ghz-->
<!-- P CPU - PRIME CPU max freq ~1.9 Ghz -->
<!-- GPU - min pwrlevel 5 (freq 285 Mhz) -->
- <!-- GPU - max pwrlevel 5 (freq 285 Mhz) -->
+ <!-- GPU - max pwrlevel 0 (freq 681 Mhz) -->
<!-- Min Big CPUs 3 -->
<!-- Min Prime CPUs 1 -->
<!-- Indefinite Duration -->
<Config
Id="0x00001312" Enable="true" Target="anorak" Timeout="0"
Resources="0x40800000, 0x2B3, 0x40804000, 0x780, 0x40800100, 0x253, 0x40804100, 0x506,
- 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x5, 0x41000000, 0x3,
+ 0x40800200, 0x2B3, 0x40804200, 0x780, 0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3,
0x41000200, 0x1"/>
<!--camera ZSLPreview-->
diff --git a/config/lahaina/powerhint.xml b/config/lahaina/powerhint.xml
index 8bb63d8..9b8a87c 100644
--- a/config/lahaina/powerhint.xml
+++ b/config/lahaina/powerhint.xml
@@ -213,13 +213,13 @@
<!--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 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-->
+ <!--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"/>
@@ -229,14 +229,14 @@
<!--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 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 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-->
+ <!--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, 0x21, 0x41808000, 0x64, 0x4180C000, 0, 0x4300C000, 0x21, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x3E6, 0x41444100, 0, 0x41440100, 0x63,0x43420000, 0xC8"/>
@@ -245,14 +245,14 @@
<!--CPU-LLC BWMON - Set sample_ms 16 -->
<!--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 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 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-->
+ <!--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, 0x64, 0x4180C000, 0, 0x4300C000, 0x10, 0x43004000, 0x64, 0x43008000, 0, 0x40800100, 0x4B9, 0x41444100, 0, 0x41440100, 0x63, 0x43420000, 0xC8"/>
@@ -261,14 +261,14 @@
<!--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 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 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-->
+ <!--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"/>
@@ -286,6 +286,24 @@
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 SHDR-->
+ <!--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="0x00001337" 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"/>
+
<!--camera preview -->
<!--L CPU CORE 0 SCHED LOAD BOOST -->
<!--L CPU CORE 1 SCHED LOAD BOOST -->
@@ -670,6 +688,26 @@
0x40C68130, 0xFFFFFFFA, 0x4143C100, 940, 0x4183C000, 0x14, 0x43034000, 0x14,
0x40800100, 940, 0x40804100, 1804, 0x40CEC000, 0x1"/>
+ <!-- camera 30FPS SHDR -->
+ <!--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 Hispeed freq of 940Mhz -->
+ <!--L CPU - Set hispeed load 95 -->
+ <!--CPU-LLCC BWMON - Set sample_ms 20 -->
+ <!--LLCC-DDR BWMON - Set sample_ms 20 -->
+ <!--L CPU Min Freq 1324, Max Freq 1804 -->
+ <!--Sched downmigrate/group_downmigrate 40, Upmigrate/group_upmigrate 45 -->
+ <!--Sched_Prefer_spread 2 -->
+ <!--B CPU Min Freq 940 -->
+ <Config
+ Id="0x00001337" Enable="true" Timeout="0" Target="yupik"
+ Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+ 0x40C68130, 0xFFFFFFFA, 0x4143C100, 940, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000,
+ 0x14, 0x40800100, 1324, 0x40804100, 1804, 0x40C58000, 40, 0x40C54000, 45, 0x40C20000, 40,
+ 0x40C1C000, 45, 0x40CA8000, 0x2, 0x40800000, 940"/>
+
<!-- same settings for all the qvr power levels intentionally -->
<!-- qvr level cpu1 gpu1 -->
<!-- Prime CPU - Cluster min freq ~.806 Ghz -->