From 209c26642c5567aefec684a0fbda795dab960661 Mon Sep 17 00:00:00 2001
From: Zheng Yang <zhengyang@rock-chips.com>
Date: Fri, 30 Oct 2015 16:52:16 +0800
Subject: [PATCH] video: rockchip: fb: delete DISPLAY_POLICY_BOX_TEMP
Change-Id: I59147b833754d5417d2813eb902923b4f700a9b0
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
---
drivers/video/rockchip/rk_fb.c | 16 +++++-----------
include/dt-bindings/rkfb/rk_fb.h | 1 -
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 855c28441bb3..66cb3a55f4f9 100755
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -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);
}
diff --git a/include/dt-bindings/rkfb/rk_fb.h b/include/dt-bindings/rkfb/rk_fb.h
index d13c4a6336dc..7e0596fd568d 100755
--- a/include/dt-bindings/rkfb/rk_fb.h
+++ b/include/dt-bindings/rkfb/rk_fb.h
@@ -76,7 +76,6 @@
#define DISPLAY_POLICY_SDK 0
#define DISPLAY_POLICY_BOX 1
-#define DISPLAY_POLICY_BOX_TEMP 2
/* lvds connect config
*
--
2.34.1