From: Huang Jiachai <hjc@rock-chips.com>
Date: Fri, 6 Jan 2017 02:52:59 +0000 (+0800)
Subject: video: rockchip: fb: fix switch screen lead to splash screen
X-Git-Tag: firefly_0821_release~785
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b5910762f5361a42b1b9f8aa5d5df3e537a39213;p=firefly-linux-kernel-4.4.55.git

video: rockchip: fb: fix switch screen lead to splash screen

Change-Id: Ie4fe5d3d3dc010ee7c7c8b15b24f435798c5bc46
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 c053315dd4c2..1be959bc7dc8 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -3725,13 +3725,6 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
 					dev_drv->ops->win_direct_en(dev_drv, i, 0);
 			}
 		}
-		if (dev_drv->uboot_logo) {
-			if (dev_drv->cur_screen->mode.xres !=
-				screen->mode.xres ||
-			    dev_drv->cur_screen->mode.yres !=
-				screen->mode.yres)
-				load_screen = 1;
-		}
 		if (dev_drv->screen1)
 			dev_drv->cur_screen = dev_drv->screen1;