Change-Id: I6dff985f3c2b44c6b461e0ee039823e59839b52c
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
mutex_unlock(&dev_drv->switch_screen);
return 0;
} else {
mutex_unlock(&dev_drv->switch_screen);
return 0;
} else {
+ if (load_screen || (rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
+ for (i = 0; i < dev_drv->lcdc_win_num; i++) {
+ if (dev_drv->win[i] && dev_drv->win[i]->state &&
+ dev_drv->ops->win_direct_en)
+ dev_drv->ops->win_direct_en(dev_drv, i, 0);
+ }
+ }
if (dev_drv->uboot_logo) {
if (dev_drv->cur_screen->mode.xres !=
screen->mode.xres ||
if (dev_drv->uboot_logo) {
if (dev_drv->cur_screen->mode.xres !=
screen->mode.xres ||
dev_drv->cur_screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
}
dev_drv->cur_screen->y_mirror = dev_drv->rotate_mode & Y_MIRROR;
}
- if (load_screen || (rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
- for (i = 0; i < dev_drv->lcdc_win_num; i++) {
- if (dev_drv->win[i] && dev_drv->win[i]->state &&
- dev_drv->ops->win_direct_en)
- dev_drv->ops->win_direct_en(dev_drv, i, 0);
- }
- }
-
if (!dev_drv->uboot_logo || load_screen ||
(rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
for (i = 0; i < dev_drv->lcdc_win_num; i++) {
if (!dev_drv->uboot_logo || load_screen ||
(rk_fb->disp_policy != DISPLAY_POLICY_BOX)) {
for (i = 0; i < dev_drv->lcdc_win_num; i++) {