From: Huang Jiachai <hjc@rock-chips.com>
Date: Mon, 21 Mar 2016 07:19:59 +0000 (+0800)
Subject: video: rockchip: fb: the default state of FBDC is closed
X-Git-Tag: firefly_0821_release~3037
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a40e1eaedf72f8be11278ce69c724be7f6b6c3de;p=firefly-linux-kernel-4.4.55.git

video: rockchip: fb: the default state of FBDC is closed

Change-Id: I6c1a4e47daa00089bfeb7b7316dbe6bac4409a5c
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index c63bfee0d9c0..ab7940680389 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -1697,6 +1697,7 @@ static void rk_fb_update_win(struct rk_lcdc_driver *dev_drv,
 				}
 			} else {
 				win->area[i].state = 0;
+				win->area[i].fbdc_en = 0;
 				if (dev_drv->iommu_enabled) {
 					g_now_config_addr[win->id][i] = 0;
 					g_now_config_state[win->id][i] = 0;
@@ -1876,8 +1877,10 @@ static void rk_fb_update_reg(struct rk_lcdc_driver *dev_drv,
 		} else {
 			win->z_order = -1;
 			win->state = 0;
-			for (j = 0; j < 4; j++)
+			for (j = 0; j < 4; j++) {
 				win->area[j].state = 0;
+				win->area[j].fbdc_en = 0;
+			}
 			if (dev_drv->iommu_enabled) {
 				for (j = 0; j < 4; j++) {
 					g_now_config_addr[i][j] = 0;