video: rockchip: fb: disable mutex when load_screen
authorZheng Yang <zhengyang@rock-chips.com>
Tue, 8 Dec 2015 00:46:06 +0000 (08:46 +0800)
committerHuang Jiachai <hjc@rock-chips.com>
Thu, 17 Dec 2015 07:21:06 +0000 (15:21 +0800)
This mutex is conflict witch mutex located at rk_fb_update_reg,
it can make system deadlock and showing black picture.

Change-Id: I55192e8cd32961ef24dd950639055bbf56e9fec9
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
drivers/video/rockchip/rk_fb.c

index 976089450d530779e697385b51209a2223f5802f..69e6e852308a06f686c3345e90e9b19aeb9feb3b 100644 (file)
@@ -3535,9 +3535,7 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
                        win_id = dev_drv->ops->fb_get_win_id(dev_drv, info->fix.id);
                        win = dev_drv->win[win_id];
                        if (win && fb_par->state) {
-                               mutex_lock(&dev_drv->win_config);
                                dev_drv->ops->load_screen(dev_drv, 1);
-                               mutex_unlock(&dev_drv->win_config);
 
                                info->var.activate |= FB_ACTIVATE_FORCE;
                                if (rk_fb->disp_mode == ONE_DUAL) {