shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: video: fix logo display when switch screen

Browse Source 
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
This commit is contained in:
Mark Yao
2015-04-28 14:52:23 +08:00
parent 05e1ad00f0
commit 63f03d7c12
1 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/video/rockchip/rk_fb.c
View File

@@ -2830,6 +2830,10 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
break;
}
memset(&win_data, 0, sizeof(struct rk_fb_win_cfg_data));
if (dev_drv->uboot_logo)
dev_drv->uboot_logo = 0;
break;
default:
dev_drv->ops->ioctl(dev_drv, cmd, arg, win_id);
@@ -3373,7 +3377,8 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
struct rk_fb_par *fb_par = NULL;
struct rk_lcdc_driver *dev_drv = NULL;
char name[6] = {0};
int i, win_id, load_screen = 0;
int i, win_id;
static bool load_screen = false;
char *envp[3];
if (unlikely(!rk_fb) || unlikely(!screen))
@@ -3424,15 +3429,11 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
(rk_fb->disp_policy != DISPLAY_POLICY_BOX) &&
(rk_fb->disp_policy != DISPLAY_POLICY_BOX_TEMP))
dev_drv->ops->backlight_close(dev_drv, 1);
if (dev_drv->ops->dsp_black)
dev_drv->ops->dsp_black(dev_drv, 1);
if ((dev_drv->ops->set_screen_scaler) &&
(rk_fb->disp_mode == ONE_DUAL))
dev_drv->ops->set_screen_scaler(dev_drv,
dev_drv->screen0, 0);
}
if (dev_drv->uboot_logo && (screen->type != dev_drv->cur_screen->type))
dev_drv->uboot_logo = 0;
if (!enable) {
/* if screen type is different, we do not disable lcdc. */
if (dev_drv->cur_screen->type != screen->type) {
@@ -3461,6 +3462,17 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
info->fbops->fb_pan_display(&info->var, info);
mutex_unlock(&dev_drv->win_config);
/*
* if currently is loader display, black until new
* display job.
*/
if (dev_drv->uboot_logo) {
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
if (dev_drv->win[i] && dev_drv->win[i]->state)
dev_drv->ops->open(dev_drv, i, 0);
}
}
/*if (dev_drv->ops->dsp_black)
dev_drv->ops->dsp_black(dev_drv, 0);*/
if ((dev_drv->ops->backlight_close) &&
@@ -3494,23 +3506,15 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
dev_drv->cur_screen->x_mirror = dev_drv->rotate_mode & X_MIRROR;
dev_drv->cur_screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
}
if ((!dev_drv->uboot_logo) ||
((rk_fb->disp_policy != DISPLAY_POLICY_BOX) &&
(rk_fb->disp_policy != DISPLAY_POLICY_BOX_TEMP))) {
if (!dev_drv->uboot_logo || load_screen) {
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
info = rk_fb->fb[dev_drv->fb_index_base + i];
fb_par = (struct rk_fb_par *)info->par;
win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
if (dev_drv->win[win_id]) {
if (fb_par->state) {
if (!dev_drv->win[win_id]->state) {
dev_drv->ops->open(dev_drv, win_id, 1);
dev_drv->suspend_flag = 0;
}
if (!load_screen) {
dev_drv->ops->load_screen(dev_drv, 1);
load_screen = 1;
}
dev_drv->ops->load_screen(dev_drv, 1);
info->var.activate |= FB_ACTIVATE_FORCE;
if (rk_fb->disp_mode == ONE_DUAL) {
info->var.grayscale &= 0xff;
@@ -3518,19 +3522,25 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
(dev_drv->cur_screen->xsize << 8) +
(dev_drv->cur_screen->ysize << 20);
}
mutex_lock(&dev_drv->win_config);
info->var.yoffset = 0;
info->fbops->fb_set_par(info);
info->fbops->fb_pan_display(&info->var, info);
mutex_unlock(&dev_drv->win_config);
if (dev_drv->uboot_logo) {
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
if (dev_drv->win[i] && dev_drv->win[i]->state)
dev_drv->ops->open(dev_drv, i, 0);
}
} else if (!dev_drv->win[win_id]->state) {
dev_drv->ops->open(dev_drv, win_id, 1);
dev_drv->suspend_flag = 0;
mutex_lock(&dev_drv->win_config);
info->var.yoffset = 0;
info->fbops->fb_set_par(info);
info->fbops->fb_pan_display(&info->var, info);
mutex_unlock(&dev_drv->win_config);
}
}
}
}
}else {
dev_drv->uboot_logo = 0;
}
kobject_uevent_env(&dev_drv->dev->kobj, KOBJ_CHANGE, envp);
kobject_uevent_env(&dev_drv->dev->kobj, KOBJ_CHANGE, envp);
kfree(envp[1]);
hdmi_switch_state = 1;