Merge 08782496ca3dd54b0c3e5233bfef0f977089308f on remote branch
Change-Id: I598b7fe6b201e012e2bd81b866d7b05069c4512d
diff --git a/config/neo/powerhint.xml b/config/neo/powerhint.xml
index e76ac6b..a57ab12 100644
--- a/config/neo/powerhint.xml
+++ b/config/neo/powerhint.xml
@@ -90,14 +90,14 @@
<!--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 -->
- <!--CPU-LLC-DDR BWMON - Set min_freq 547 -->
+ <!--CPU-LLC-DDR BWMON - Set min_freq 1555 -->
<!--CPU - Disable schedutil PL -->
<!--CPU - Set hispeed load 99 -->
<!--AB_SCALE - 50-->
<Config
Id="0x00001331" Enable="true" Timeout="0" Target="neo_la"
Resources="0x4183C000, 0x21, 0x41834000, 0x64, 0x41838000, 0, 0x41848000, 0xE3C88, 0x43034000, 0x21,
- 0x43020000, 0x64, 0x43024000, 0, 0x4303C000, 0x858B8 , 0x41444000, 0, 0x41440000, 0x63, 0x43048000, 0x32"/>
+ 0x43020000, 0x64, 0x43024000, 0, 0x4303C000, 0x17BA38 , 0x41444000, 0, 0x41440000, 0x63, 0x43048000, 0x32"/>
<!--camera 60fps-->
<!--CPU-LLC BWMON - Set sample_ms 16 -->
@@ -365,18 +365,20 @@
<!-- MPCTLV3_SCHED_BOOST, 0x1 -->
<!-- MPCTLV3_MAX_FREQ_CLUSTER_LITTLE_CORE_0, Max value -->
<!-- MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0, Max value -->
+ <!--CPU-LLC-DDR BWMON - Set min_freq 1555 -->
<Config
Id="0x00001337" Enable="true" Timeout="0" Target="neo_la"
- Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0XFFFF, 0x40800000, 0XFFFF"/>
+ Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0XFFFF, 0x40800000, 0XFFFF, 0x4303C000, 0x17BA38"/>
<!-- camera close tunings-->
<!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->
<!-- MPCTLV3_SCHED_BOOST, 0x1 -->
<!-- MPCTLV3_MAX_FREQ_CLUSTER_LITTLE_CORE_0, Max value -->
<!-- MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0, Max value -->
+ <!--CPU-LLC-DDR BWMON - Set min_freq 1555 -->
<Config
Id="0x00001338" Enable="true" Timeout="0" Target="neo_la"
- Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0XFFFF, 0x40800000, 0XFFFF"/>
+ Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0XFFFF, 0x40800000, 0XFFFF, 0x4303C000, 0x17BA38"/>
<!-- camera snapshot tunings-->
<!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->
diff --git a/config/parrot/powerhint.xml b/config/parrot/powerhint.xml
index 71b0bef..cef9e37 100644
--- a/config/parrot/powerhint.xml
+++ b/config/parrot/powerhint.xml
@@ -369,66 +369,60 @@
<!--camera preview -->
<!--L CPU SCHED LOAD BOOST -->
<!--B CPU SCHED LOAD BOOST -->
- <!--L CPU Hispeed freq of 940Mhz -->
+ <!--L CPU Hispeed freq of 920Mhz -->
<!--L CPU - Set hispeed load 95 -->
<!--CPU-DDR BWMON - Set sample_ms 33 -->
- <!--CPU MAX freq 1.5Ghz -->
- <!--Sched downmigrate/group_downmigrate 40, Upmigrate/group_upmigrate 45 -->
- <!--B CPU core ctl min cpus 4 -->
+ <!--CPU MAX freq 1.8Ghz -->
+ <!--B CPU core ctl min cpus 6 -->
<!--AB-SCALE - 50 -->
<!--CPU-DDR BWMON - io percent 100 -->
<Config
Id="0x00001330" Enable="true" Timeout="0" Target="ravelin"
- Resources="0x40C68100, -10, 0x40C68000, -10, 0x4143C100, 940, 0x41440100, 0x5F,
- 0x43034000, 0x21, 0x40804100, 1497, 0x40CE0000, 0x002D0028, 0x40CF4000, 0x002D0028,
- 0x41000000, 0x4, 0x43048000, 0x32, 0x43020000, 100"/>
+ Resources="0x40C68100, -10, 0x40C68000, -10, 0x4143C100, 920, 0x41440100, 0x5F,
+ 0x43034000, 0x21, 0x40804100, 1804,0x41000100, 6,0x43048000, 0x32, 0x43020000, 100"/>
<!-- camera 30fps encode -->
<!--L CPU SCHED LOAD BOOST -->
<!--B CPU SCHED LOAD BOOST -->
- <!--L CPU Hispeed freq of 940Mhz -->
+ <!--L CPU Hispeed freq of 920Mhz -->
<!--L CPU - Set hispeed load 95 -->
<!--CPU-DDR BWMON - Set sample_ms 33 -->
- <!--L CPU Min Freq 940Mhz, Max Freq 1.5Ghz -->
- <!--Sched downmigrate/group_downmigrate 40, Upmigrate/group_upmigrate 45 -->
- <!--B CPU core ctl min cpus 4 -->
+ <!--L CPU Min Freq 920Mhz, Max Freq 1.8Ghz -->
+ <!--B CPU core ctl min cpus 6 -->
<!--AB_SCALE - 50 -->
<!--CPU-DDR BWMON - io percent 100 -->
<Config
Id="0x00001331" Enable="true" Timeout="0" Target="ravelin"
- Resources="0x40C68100, -10, 0x40C68000, -10, 0x4143C100, 940, 0x41440100, 0x5F,
- 0x43034000, 0x21, 0x40800100, 940, 0x40804100, 1497, 0x40CE0000, 0x002D0028,
- 0x40CF4000, 0x002D0028, 0x41000000, 0x4, 0x43048000, 0x32, 0x43020000, 100"/>
+ Resources="0x40C68100, -10, 0x40C68000, -10, 0x4143C100, 920, 0x41440100, 0x5F,
+ 0x43034000, 0x21, 0x40800100, 920, 0x40804100, 1804, 0x41000100, 6,
+ 0x43048000, 0x32, 0x43020000, 100"/>
<!-- camera 60 FPS -->
<!--L CPU SCHED LOAD BOOST -->
<!--B CPU SCHED LOAD BOOST -->
<!--CPU-DDR BWMON - Set sample_ms 33 -->
- <!--CPU MAX freq 1.5Ghz -->
- <!--Sched downmigrate/group_downmigrate 30, Upmigrate/group_upmigrate 35 -->
- <!--B CPU core ctl min cpus 4 -->
+ <!--CPU MAX freq 1.8Ghz -->
+ <!--B CPU core ctl min cpus 6 -->
<!--AB_SCALE - 50 -->
<!--CPU-DDR BWMON - io percent 100 -->
<!--CPU-LLC-DDR BWMON - Set min_freq 1555 -->
<Config
Id="0x00001332" Enable="true" Timeout="0" Target="ravelin"
- Resources="0x40C68100, -10, 0x40C68000, -10, 0x43034000, 0x21, 0x40804100, 1497,
- 0x40CE0000, 0x0023001E, 0x40CF4000, 0x0023001E, 0x41000000, 0x4, 0x43048000, 0x32,
- 0x43020000, 100, 0x4303C000, 0x17BA38"/>
+ Resources="0x40C68100, -10, 0x40C68000, -10, 0x43034000, 0x21, 0x40804100, 1804,
+ 0x41000100, 6, 0x43048000, 0x32, 0x43020000, 100, 0x4303C000, 0x17BA38"/>
<!-- camera HFR -->
<!--L CPU CORE 0 SCHED LOAD BOOST -->
<!--B CPU SCHED LOAD BOOST -->
<!--CPU-DDR BWMON - Set sample ms 33 -->
- <!--CPU CORE 0 Min freq to 1.113Ghz -->
- <!--CPU MAX freq 1.5Ghz -->
- <!--Sched downmigrate/group_downmigrate 30, Upmigrate/group_upmigrate 35 -->
- <!--B CPU core ctl min cpus 4 -->
+ <!--CPU CORE 0 Min freq to 1Ghz -->
+ <!--CPU MAX freq 1.8Ghz -->
+ <!--B CPU core ctl min cpus 6 -->
<!--CPU-DDR BWMON - io percent 100 -->
<Config
Id="0x00001333" Enable="true" Timeout="0" Target="ravelin"
- Resources="0x40C68100, -10, 0x40C68000, -10, 0x43034000, 0x21, 0x40800100, 0x459,
- 0x40804100, 1497, 0x40CE0000, 0x0023001E, 0x40CF4000, 0x0023001E, 0x41000000, 0x4,
+ Resources="0x40C68100, -10, 0x40C68000, -10, 0x43034000, 0x21, 0x40800100, 0x3E8,
+ 0x40804100, 1804, 0x41000100, 6,
0x43020000, 100"/>
<!-- HFR 480fps -->