From: hjc <hjc@rock-chips.com>
Date: Wed, 20 Aug 2014 01:27:13 +0000 (+0800)
Subject: rk312x lcdc: add interlace condition for interlace read
X-Git-Tag: firefly_0821_release~4854
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c240bc96de2292fa91bf0fc45dd00f2ad9a3b179;p=firefly-linux-kernel-4.4.55.git

rk312x lcdc: add interlace condition for interlace read
---

diff --git a/drivers/video/rockchip/lcdc/rk3036_lcdc.c b/drivers/video/rockchip/lcdc/rk3036_lcdc.c
index 8389d5ec98ce..40c0cfd08760 100755
--- a/drivers/video/rockchip/lcdc/rk3036_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3036_lcdc.c
@@ -750,7 +750,7 @@ static int rk3036_lcdc_set_par(struct rk_lcdc_driver *dev_drv, int win_id)
 	win->scale_yrgb_x = calscale(win->area[0].xact, win->post_cfg.xsize);
 	win->scale_yrgb_y = calscale(win->area[0].yact, win->post_cfg.ysize);
 	win->interlace_read = 0;
-	if((screen->mode.xres == 720) &&
+	if( (screen->mode.vmode == 1) && (screen->mode.xres == 720) &&
 	  ((screen->mode.yres == 576) || (screen->mode.yres == 480))) {
 		if(win->scale_yrgb_y > 2*0x1000)
 			win->interlace_read = 1;
diff --git a/drivers/video/rockchip/lcdc/rk312x_lcdc.c b/drivers/video/rockchip/lcdc/rk312x_lcdc.c
index 967c078678c8..0dacb03de3c3 100755
--- a/drivers/video/rockchip/lcdc/rk312x_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk312x_lcdc.c
@@ -1147,7 +1147,7 @@ static int rk312x_lcdc_set_par(struct rk_lcdc_driver *dev_drv, int win_id)
 	win->scale_yrgb_y = CalScale(win->area[0].yact, win->area[0].ysize);
 
 	win->interlace_read = 0;
-	if((screen->mode.xres == 720) &&
+	if((screen->mode.vmode == 1) && (screen->mode.xres == 720) &&
 	  ((screen->mode.yres == 576) || (screen->mode.yres == 480))) {
 		if (lcdc_dev->soc_type == VOP_RK3036) {
 			if (win->scale_yrgb_y > 2*0x1000)