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

rk fb: fix open hdmi open backlight again in no dual mode

Browse Source 
Signed-off-by: hjc <hjc@rock-chips.com>
This commit is contained in:
hjc
2014-12-16 10:00:55 +08:00
committed by Huang, Tao
parent b3cd2058cd
commit b490bce9e0
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3588,7 +3588,8 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
return 0;
/* if used one lcdc to dual disp, no need to close win */
if (rk_fb->disp_mode == ONE_DUAL) {
if ((rk_fb->disp_mode == ONE_DUAL) ||
(rk_fb->disp_mode == NO_DUAL)) {
dev_drv->cur_screen = dev_drv->screen0;
dev_drv->ops->load_screen(dev_drv, 1);
@@ -3677,7 +3678,8 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
if (dev_drv->ops->dsp_black)
dev_drv->ops->dsp_black(dev_drv, 0);
if ((dev_drv->ops->backlight_close) &&
(rk_fb->disp_policy != DISPLAY_POLICY_BOX))
(rk_fb->disp_policy != DISPLAY_POLICY_BOX) &&
(rk_fb->disp_mode == ONE_DUAL))
dev_drv->ops->backlight_close(dev_drv, 0);
}
return 0;
@@ -4198,8 +4200,9 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
vaddr = vmap(pages, nr_pages, VM_MAP,
pgprot_writecombine(PAGE_KERNEL));
if (!vaddr) {
pr_err("failed to vmap phy addr %x\n",
uboot_logo_base + uboot_logo_offset);
pr_err("failed to vmap phy addr 0x%lx\n",
(long)(uboot_logo_base +
uboot_logo_offset));
return -1;
}