From: yxj Date: Sat, 26 Jan 2013 08:08:37 +0000 (+0800) Subject: move load_screen to rk_fb_register X-Git-Tag: firefly_0821_release~7731 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ddb327bd4e7693e3bd3d03fe60d524436957007b;p=firefly-linux-kernel-4.4.55.git move load_screen to rk_fb_register --- diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c index f756440e8226..7c7ff9fb59f4 100644 --- a/drivers/video/rockchip/rk_fb.c +++ b/drivers/video/rockchip/rk_fb.c @@ -95,7 +95,6 @@ static int rk_fb_open(struct fb_info *info,int user) else { dev_drv->open(dev_drv,layer_id,1); - dev_drv->load_screen(dev_drv,1); } return 0; @@ -1173,6 +1172,7 @@ int rk_fb_register(struct rk_lcdc_device_driver *dev_drv, if(dev_drv->screen_ctr_info->prop == PRMRY) //show logo for primary display device { fb_inf->fb[0]->fbops->fb_open(fb_inf->fb[0],1); + dev_drv->load_screen(dev_drv,1); fb_inf->fb[0]->fbops->fb_set_par(fb_inf->fb[0]); #if defined(CONFIG_LOGO_LINUX_BMP)