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

rk3368 lcdc: fix system crash when send reboot cmd in sleep mode

Browse Source 
Signed-off-by: hjc <hjc@rock-chips.com>
This commit is contained in:
hjc
2015-05-05 14:40:00 +08:00
parent 92077716d1
commit 506d331dde
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/video/rockchip/lcdc/rk3368_lcdc.c
View File

@@ -479,25 +479,26 @@ static void rk3368_lcdc_deint(struct lcdc_device *lcdc_dev)
{
u32 mask, val;
rk3368_lcdc_disable_irq(lcdc_dev);
spin_lock(&lcdc_dev->reg_lock);
mask = m_WIN0_EN;
val = v_WIN0_EN(0);
lcdc_msk_reg(lcdc_dev, WIN0_CTRL0, mask, val);
lcdc_msk_reg(lcdc_dev, WIN1_CTRL0, mask, val);
mask = m_WIN2_EN | m_WIN2_MST0_EN |
m_WIN2_MST1_EN |
m_WIN2_MST2_EN | m_WIN2_MST3_EN;
val = v_WIN2_EN(0) | v_WIN2_MST0_EN(0) |
v_WIN2_MST1_EN(0) |
v_WIN2_MST2_EN(0) | v_WIN2_MST3_EN(0);
lcdc_msk_reg(lcdc_dev, WIN2_CTRL0, mask, val);
lcdc_msk_reg(lcdc_dev, WIN3_CTRL0, mask, val);
lcdc_cfg_done(lcdc_dev);
spin_unlock(&lcdc_dev->reg_lock);
mdelay(50);
if (lcdc_dev->clk_on) {
rk3368_lcdc_disable_irq(lcdc_dev);
spin_lock(&lcdc_dev->reg_lock);
mask = m_WIN0_EN;
val = v_WIN0_EN(0);
lcdc_msk_reg(lcdc_dev, WIN0_CTRL0, mask, val);
lcdc_msk_reg(lcdc_dev, WIN1_CTRL0, mask, val);
mask = m_WIN2_EN | m_WIN2_MST0_EN |
m_WIN2_MST1_EN |
m_WIN2_MST2_EN | m_WIN2_MST3_EN;
val = v_WIN2_EN(0) | v_WIN2_MST0_EN(0) |
v_WIN2_MST1_EN(0) |
v_WIN2_MST2_EN(0) | v_WIN2_MST3_EN(0);
lcdc_msk_reg(lcdc_dev, WIN2_CTRL0, mask, val);
lcdc_msk_reg(lcdc_dev, WIN3_CTRL0, mask, val);
lcdc_cfg_done(lcdc_dev);
spin_unlock(&lcdc_dev->reg_lock);
mdelay(50);
}
}
static int rk3368_lcdc_post_cfg(struct rk_lcdc_driver *dev_drv)
@@ -4847,8 +4848,8 @@ static void rk3368_lcdc_shutdown(struct platform_device *pdev)
flush_kthread_worker(&dev_drv->update_regs_worker);
kthread_stop(dev_drv->update_regs_thread);
rk3368_lcdc_deint(lcdc_dev);
if (dev_drv->trsm_ops && dev_drv->trsm_ops->disable)
dev_drv->trsm_ops->disable();
/*if (dev_drv->trsm_ops && dev_drv->trsm_ops->disable)
dev_drv->trsm_ops->disable();*/
rk3368_lcdc_clk_disable(lcdc_dev);
rk_disp_pwr_disable(dev_drv);