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

video: rockchip: 3399: close auto gating when enable CABC

Browse Source 
Change-Id: Iaeb99bbc1f25998361cd20fc57c97f33fa5ce63a
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
This commit is contained in:
Huang Jiachai
2016-08-16 16:22:54 +08:00
committed by Huang, Tao
parent 36cd8b8ef4
commit e5930c3ed1
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/video/rockchip/lcdc/rk322x_lcdc.c
View File

@@ -4382,6 +4382,9 @@ static int vop_set_dsp_cabc(struct rk_lcdc_driver *dev_drv, int mode,
struct rk_screen *screen = dev_drv->cur_screen;
u32 total_pixel, calc_pixel, stage_up, stage_down;
u32 pixel_num, global_dn;
u64 val = 0;
ktime_t timestamp;
int ret = 0;
if (!vop_dev->cabc_lut_addr_base) {
pr_err("vop chip[%d] not supoort cabc\n", VOP_CHIP(vop_dev));
@@ -4400,6 +4403,9 @@ static int vop_set_dsp_cabc(struct rk_lcdc_driver *dev_drv, int mode,
vop_msk_reg(vop_dev, CABC_CTRL0,
V_CABC_EN(0) | V_CABC_HANDLE_EN(0));
vop_cfg_done(vop_dev);
while (vop_read_bit(vop_dev, CABC_CTRL0, V_CABC_EN(0)))
;
vop_msk_reg(vop_dev, SYS_CTRL, V_AUTO_GATING_EN(1));
}
pr_info("mode = 0, close cabc\n");
spin_unlock(&vop_dev->reg_lock);
@@ -4417,10 +4423,11 @@ static int vop_set_dsp_cabc(struct rk_lcdc_driver *dev_drv, int mode,
spin_lock(&vop_dev->reg_lock);
if (vop_dev->clk_on) {
u64 val = 0;
val = V_CABC_EN(1) | V_CABC_HANDLE_EN(1) |
V_PWM_CONFIG_MODE(STAGE_BY_STAGE) |
vop_msk_reg(vop_dev, SYS_CTRL, V_AUTO_GATING_EN(0));
vop_cfg_done(vop_dev);
while (vop_read_bit(vop_dev, SYS_CTRL, V_AUTO_GATING_EN(0)))
;
val = V_PWM_CONFIG_MODE(STAGE_BY_STAGE) |
V_CABC_CALC_PIXEL_NUM(calc_pixel);
vop_msk_reg(vop_dev, CABC_CTRL0, val);
@@ -4440,6 +4447,21 @@ static int vop_set_dsp_cabc(struct rk_lcdc_driver *dev_drv, int mode,
}
spin_unlock(&vop_dev->reg_lock);
timestamp = dev_drv->vsync_info.timestamp;
ret = wait_event_interruptible_timeout(dev_drv->vsync_info.wait,
!ktime_equal(timestamp, dev_drv->vsync_info.timestamp),
msecs_to_jiffies(50));
if (ret < 0)
return ret;
else if (ret == 0)
pr_err("%s wait vsync time out\n", __func__);
spin_lock(&vop_dev->reg_lock);
val = V_CABC_EN(1) | V_CABC_HANDLE_EN(1);
vop_msk_reg(vop_dev, CABC_CTRL0, val);
vop_cfg_done(vop_dev);
spin_unlock(&vop_dev->reg_lock);
return 0;
}