From: 陈亮 <cl@rock-chips.com>
Date: Thu, 18 Sep 2014 10:07:49 +0000 (-0700)
Subject: ddr_freq: select suspend rate if both suspend and video_4k status are set
X-Git-Tag: firefly_0821_release~4667
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d8b42855b36455b382e8f59fff66e94edb274be8;p=firefly-linux-kernel-4.4.55.git

ddr_freq: select suspend rate if both suspend and video_4k status are set

Signed-off-by: 陈亮 <cl@rock-chips.com>
---

diff --git a/arch/arm/mach-rockchip/ddr_freq.c b/arch/arm/mach-rockchip/ddr_freq.c
index 982971522045..247a8bb90783 100644
--- a/arch/arm/mach-rockchip/ddr_freq.c
+++ b/arch/arm/mach-rockchip/ddr_freq.c
@@ -330,7 +330,7 @@ static noinline long ddrfreq_work(unsigned long sys_status)
 		 }
 	 }
 
-	if (ddr.video_4k_rate && (s & SYS_STATUS_VIDEO_4K)) {
+	if (ddr.video_4k_rate && (s & SYS_STATUS_VIDEO_4K) && !(s & SYS_STATUS_SUSPEND)) {
 		if (ddr.video_4k_rate > target_rate) {
 			target_rate = ddr.video_4k_rate;
 			auto_self_refresh = false;