projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
52af415
)
move load_screen to rk_fb_register
author
yxj
<yxj@rock-chips.com>
Sat, 26 Jan 2013 08:08:37 +0000
(16:08 +0800)
committer
yxj
<yxj@rock-chips.com>
Mon, 28 Jan 2013 09:25:27 +0000
(17:25 +0800)
drivers/video/rockchip/rk_fb.c
patch
|
blob
|
history
diff --git
a/drivers/video/rockchip/rk_fb.c
b/drivers/video/rockchip/rk_fb.c
index f756440e8226ec5fcfbb23ebb03787ff6152cec4..7c7ff9fb59f48564d1ff33c44bf26ea9719ce614 100644
(file)
--- 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)