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

video: rockchip: fb: delete DISPLAY_POLICY_BOX_TEMP

Browse Source 
Change-Id: I59147b833754d5417d2813eb902923b4f700a9b0
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-10-30 16:52:16 +08:00
parent 83611653ad
commit 209c26642c
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3436,12 +3436,10 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
if ((rk_fb->disp_mode == ONE_DUAL) ||
(rk_fb->disp_mode == NO_DUAL)) {
if ((dev_drv->ops->backlight_close) &&
(rk_fb->disp_policy != DISPLAY_POLICY_BOX) &&
(rk_fb->disp_policy != DISPLAY_POLICY_BOX_TEMP))
(rk_fb->disp_policy != DISPLAY_POLICY_BOX))
dev_drv->ops->backlight_close(dev_drv, 1);
if (!dev_drv->uboot_logo || load_screen ||
((rk_fb->disp_policy != DISPLAY_POLICY_BOX) &&
(rk_fb->disp_policy != DISPLAY_POLICY_BOX_TEMP))) {
(rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
if (dev_drv->ops->dsp_black)
dev_drv->ops->dsp_black(dev_drv, 0);
}
@@ -3461,8 +3459,7 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
/* if used one lcdc to dual disp, no need to close win */
if ((rk_fb->disp_mode == ONE_DUAL) ||
((rk_fb->disp_mode == NO_DUAL) &&
(rk_fb->disp_policy != DISPLAY_POLICY_BOX) &&
(rk_fb->disp_policy != DISPLAY_POLICY_BOX_TEMP))) {
(rk_fb->disp_policy != DISPLAY_POLICY_BOX))) {
dev_drv->cur_screen = dev_drv->screen0;
dev_drv->ops->load_screen(dev_drv, 1);
/* force modify dsp size */
@@ -3493,8 +3490,7 @@ 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_TEMP))
(rk_fb->disp_policy != DISPLAY_POLICY_BOX))
dev_drv->ops->backlight_close(dev_drv, 0);
} else if (rk_fb->num_lcdc > 1) {
/* If there is more than one lcdc device, we disable
@@ -3530,8 +3526,7 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
dev_drv->cur_screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
}
if (!dev_drv->uboot_logo || load_screen ||
((rk_fb->disp_policy != DISPLAY_POLICY_BOX) &&
(rk_fb->disp_policy != DISPLAY_POLICY_BOX_TEMP))) {
(rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
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;
@@ -3592,7 +3587,6 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
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_TEMP) &&
(rk_fb->disp_mode == ONE_DUAL))
dev_drv->ops->backlight_close(dev_drv, 0);
}

1
include/dt-bindings/rkfb/rk_fb.h
View File

@@ -76,7 +76,6 @@
#define DISPLAY_POLICY_SDK 0
#define DISPLAY_POLICY_BOX 1
#define DISPLAY_POLICY_BOX_TEMP 2
/* lvds connect config
*