Merge "Perf: Make flingboost/scrollboost configurable for various msm" (75b27161) · Commits · e / os / android_frameworks_base

core/java/android/widget/OverScroller.java

+23 −1

Original line number	Diff line number	Diff line
		@@ -611,6 +611,11 @@ public class OverScroller {
		private Performance mPerf = null;
		private boolean mIsPerfLockAcquired = false;
		private boolean mIsPerfBoostEnabled = false;
		private int lBoostTimeOut = 0;
		private int lBoostCpuBoost = 0;
		private int lBoostSchedBoost = 0;
		private int lBoostPcDisblBoost = 0;
		private int lBoostKsmBoost = 0;

		static {
		float x_min = 0.0f;
		@@ -659,6 +664,18 @@ public class OverScroller {

		mIsPerfBoostEnabled = context.getResources().getBoolean(
		com.android.internal.R.bool.config_enableCpuBoostForOverScrollerFling);
		if (mIsPerfBoostEnabled) {
		lBoostSchedBoost = context.getResources().getInteger(
		com.android.internal.R.integer.flingboost_schedboost_param);
		lBoostTimeOut = context.getResources().getInteger(
		com.android.internal.R.integer.flingboost_timeout_param);
		lBoostCpuBoost = context.getResources().getInteger(
		com.android.internal.R.integer.flingboost_cpuboost_param);
		lBoostPcDisblBoost = context.getResources().getInteger(
		com.android.internal.R.integer.flingboost_pcdisbl_param);
		lBoostKsmBoost = context.getResources().getInteger(
		com.android.internal.R.integer.flingboost_ksmboost_param);
		}
		}

		void updateScroll(float q) {
		@@ -787,7 +804,12 @@ public class OverScroller {

		if (mPerf != null) {
		mIsPerfLockAcquired = true;
		mPerf.perfLockAcquire(mDuration, mPerf.CPUS_ON_2, 0x1E01, 0x20B, 0x30B, 0x1C00);
		if (0 == lBoostTimeOut) {
		lBoostTimeOut = mDuration;
		}
		mPerf.perfLockAcquire(lBoostTimeOut, lBoostPcDisblBoost, lBoostSchedBoost,
		lBoostCpuBoost, lBoostKsmBoost);

		}
		}

core/java/android/widget/Scroller.java

+25 −1

Original line number	Diff line number	Diff line
		@@ -115,6 +115,13 @@ public class Scroller {
		* true value turns it on, by default will be turned off
		*/
		private Performance mPerf = null;
		boolean bIsPerfBoostEnabled = false;
		private int lBoostTimeOut = 0;
		private int lBoostCpuBoost = 0;
		private int lBoostSchedBoost = 0;
		private int lBoostPcDisblBoost = 0;
		private int lBoostKsmBoost = 0;


		// A context-specific coefficient adjusted to physical values.
		private float mPhysicalCoeff;
		@@ -189,6 +196,19 @@ public class Scroller {
		mPhysicalCoeff = computeDeceleration(0.84f); // look and feel tuning
		bIsPerfBoostEnabled = context.getResources().getBoolean(
		com.android.internal.R.bool.config_enableCpuBoostForScroller);
		if (bIsPerfBoostEnabled) {
		lBoostSchedBoost = context.getResources().getInteger(
		com.android.internal.R.integer.scrollboost_schedboost_param);
		lBoostTimeOut = context.getResources().getInteger(
		com.android.internal.R.integer.scrollboost_timeout_param);
		lBoostCpuBoost = context.getResources().getInteger(
		com.android.internal.R.integer.scrollboost_cpuboost_param);
		lBoostPcDisblBoost = context.getResources().getInteger(
		com.android.internal.R.integer.scrollboost_pcdisbl_param);
		lBoostKsmBoost = context.getResources().getInteger(
		com.android.internal.R.integer.scrollboost_ksmboost_param);
		}


		if (mPerf == null && bIsPerfBoostEnabled) {
		mPerf = new Performance();
		@@ -413,7 +433,11 @@ public class Scroller {
		mDurationReciprocal = 1.0f / (float) mDuration;

		if ((mPerf != null) && (duration != 0)) {
		mPerf.perfLockAcquire(mDuration, mPerf.CPUS_ON_2, 0x1E01, 0x20B, 0x30B, 0x1C00);
		if (0 == lBoostTimeOut) {
		lBoostTimeOut = mDuration;
		}
		mPerf.perfLockAcquire(lBoostTimeOut, lBoostPcDisblBoost, lBoostSchedBoost,
		lBoostCpuBoost, lBoostKsmBoost);
		}
		}

core/res/res/values/config.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -2029,9 +2029,19 @@

		<!-- Whether cpu boost is enabled for overscroller fling. -->
		<bool name="config_enableCpuBoostForOverScrollerFling">false</bool>
		<integer name="flingboost_timeout_param">0</integer>
		<integer name="flingboost_schedboost_param">0</integer>
		<integer name="flingboost_cpuboost_param">0</integer>
		<integer name="flingboost_pcdisbl_param">0</integer>
		<integer name="flingboost_ksmboost_param">0</integer>

		<!-- Whether cpu boost is enabled for horizontal scroll. -->
		<bool name="config_enableCpuBoostForScroller">false</bool>
		<integer name="scrollboost_timeout_param">0</integer>
		<integer name="scrollboost_schedboost_param">0</integer>
		<integer name="scrollboost_cpuboost_param">0</integer>
		<integer name="scrollboost_pcdisbl_param">0</integer>
		<integer name="scrollboost_ksmboost_param">0</integer>

		<!-- Configuration to enable non-default PDP during IWLAN -->
		<bool name="config_feature_iwlan_enabled">false</bool>
		@@ -2046,4 +2056,5 @@
		<integer name="launchboost_cpuboost_param">0</integer>
		<integer name="launchboost_pcdisbl_param">0</integer>
		<integer name="launchboost_ksmboost_param">0</integer>

		</resources>

core/res/res/values/symbols.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -2168,9 +2168,19 @@

		<!-- cpu boost for overscroller fling -->
		<java-symbol type="bool" name="config_enableCpuBoostForOverScrollerFling" />
		<java-symbol type="integer" name="flingboost_timeout_param" />
		<java-symbol type="integer" name="flingboost_schedboost_param" />
		<java-symbol type="integer" name="flingboost_cpuboost_param" />
		<java-symbol type="integer" name="flingboost_pcdisbl_param" />
		<java-symbol type="integer" name="flingboost_ksmboost_param" />

		<!-- cpu boost for horizontal scroll -->
		<java-symbol type="bool" name="config_enableCpuBoostForScroller" />
		<java-symbol type="integer" name="scrollboost_timeout_param" />
		<java-symbol type="integer" name="scrollboost_schedboost_param" />
		<java-symbol type="integer" name="scrollboost_cpuboost_param" />
		<java-symbol type="integer" name="scrollboost_pcdisbl_param" />
		<java-symbol type="integer" name="scrollboost_ksmboost_param" />

		<!-- Data Connectivity Error Configurations -->
		<java-symbol type="bool" name="config_reject_ggsn_perm_failure" />