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

rk_fb: 1. Make sure fb_par->state lowest value is zero.

Browse Source 
2. For box, video layer z-order is always zero.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-03-28 13:40:07 +08:00
parent 8de08e28f0
commit f94118bca7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -871,7 +871,8 @@ static int rk_fb_close(struct fb_info *info, int user)
if (win_id >= 0) {
win = dev_drv->win[win_id];
fb_par->state--;
if (fb_par->state)
fb_par->state--;
if (!fb_par->state) {
if (fb_par->fb_phy_base > 0)
info->fix.smem_start = fb_par->fb_phy_base;
@@ -2461,7 +2462,7 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
case RK_FBIOSET_ENABLE:
if (copy_from_user(&enable, argp, sizeof(enable)))
return -EFAULT;
if (enable)
if (enable && fb_par->state)
fb_par->state++;
else
fb_par->state--;
@@ -2909,9 +2910,10 @@ static int rk_fb_set_par(struct fb_info *info)
if (rk_fb->disp_policy == DISPLAY_POLICY_BOX &&
(win->area[0].format == YUV420 ||
win->area[0].format == YUV420_NV21 ||
win->area[0].format == YUV420_A))
win->area[0].format == YUV420_A)) {
win->state = 1;
win->z_order = 0;
}
dev_drv->ops->set_par(dev_drv, win_id);
return 0;