From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 26 Jul 2012 09:33:58 +0000 (+0800)
Subject: rk: cpufreq: interactive: revert "apply intermediate load to max speed not current"
X-Git-Tag: firefly_0821_release~8882^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=80419a3794633951a5dbd35c7c9d0be5f80441de;p=firefly-linux-kernel-4.4.55.git

rk: cpufreq: interactive: revert "apply intermediate load to max speed not current"
---

diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
index c8bc6488afc2..ac8f31f726e5 100755
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -221,7 +221,17 @@ static void cpufreq_interactive_timer(unsigned long data)
 			}
 		}
 	} else {
+#ifdef CONFIG_PLAT_RK
+		new_freq = pcpu->policy->cur * cpu_load / 100;
+		if (cpufreq_frequency_table_target(pcpu->policy, pcpu->freq_table, pcpu->policy->cur - 1, CPUFREQ_RELATION_H, &index) == 0) {
+			unsigned int prev_freq = pcpu->freq_table[index].frequency;
+			if (new_freq >= (prev_freq * go_hispeed_load / 100)) {
+				new_freq = pcpu->policy->cur;
+			}
+		}
+#else
 		new_freq = pcpu->policy->max * cpu_load / 100;
+#endif
 	}
 
 	if (new_freq <= hispeed_freq)