From: RK_ywj <ywj@rock-chips.com>
Date: Thu, 7 May 2015 09:33:00 +0000 (+0800)
Subject: when uboot logo on ,first cvbs display no need init rk1000
X-Git-Tag: firefly_0821_release~4158^2~88
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2016b53197306289e0a449e21021e6c454ce5b47;p=firefly-linux-kernel-4.4.55.git

when uboot logo on ,first cvbs display no need init rk1000
---

diff --git a/drivers/video/rockchip/lcdc/rk3368_lcdc.c b/drivers/video/rockchip/lcdc/rk3368_lcdc.c
index b4202f2b777d..9864529f38c7 100755
--- a/drivers/video/rockchip/lcdc/rk3368_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3368_lcdc.c
@@ -2102,9 +2102,11 @@ static int rk3368_load_screen(struct rk_lcdc_driver *dev_drv, bool initscreen)
 	    screen->type != SCREEN_TVOUT &&
 	    dev_drv->trsm_ops &&
 	    dev_drv->trsm_ops->enable)
-		dev_drv->trsm_ops->enable();
-	if (screen->init)
-		screen->init();
+		dev_drv->trsm_ops->enable();	
+	if(initscreen ){
+		if (screen->init)
+			screen->init();
+	}
 	if (!lcdc_dev->standby)
 		lcdc_msk_reg(lcdc_dev, SYS_CTRL, m_STANDBY_EN, v_STANDBY_EN(0));
 	return 0;