From da6f2cbfc8d7bc13b6c8ccf2c05a4a131503cf60 Mon Sep 17 00:00:00 2001 From: Huang Jiachai Date: Wed, 23 Sep 2015 18:21:39 +0800 Subject: [PATCH] video: rockchip: lcdc: 3288: update CABC lut addr Change-Id: Ifcd0e7c76962fff628c2c372057937809ee850da Signed-off-by: Huang Jiachai (cherry picked from commit 92e3d58d7ffc7d0687e032409de56b93f2e30d51) --- drivers/video/rockchip/lcdc/rk3288_lcdc.c | 6 +++--- drivers/video/rockchip/lcdc/rk3288_lcdc.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/lcdc/rk3288_lcdc.c b/drivers/video/rockchip/lcdc/rk3288_lcdc.c index 55e9dc236dd0..ee58413eec3d 100755 --- a/drivers/video/rockchip/lcdc/rk3288_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.c @@ -3562,9 +3562,9 @@ static int rk3288_lcdc_set_dsp_cabc(struct rk_lcdc_driver *dev_drv, if (!dev_drv->cabc_mode) { spin_lock(&lcdc_dev->reg_lock); if (lcdc_dev->clk_on) { - lcdc_msk_reg(lcdc_dev, CABC_CTRL0 | m_CABC_HANDLE_EN, - m_CABC_EN, v_CABC_EN(0) | - v_CABC_HANDLE_EN(0)); + lcdc_msk_reg(lcdc_dev, CABC_CTRL0, + m_CABC_HANDLE_EN | m_CABC_EN, + v_CABC_EN(0) | v_CABC_HANDLE_EN(0)); lcdc_cfg_done(lcdc_dev); } pr_info("mode = 0, close cabc\n"); diff --git a/drivers/video/rockchip/lcdc/rk3288_lcdc.h b/drivers/video/rockchip/lcdc/rk3288_lcdc.h index d83e4daa9cc4..01af7054984b 100755 --- a/drivers/video/rockchip/lcdc/rk3288_lcdc.h +++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.h @@ -1185,7 +1185,7 @@ #define WIN3_LUT_ADDR (0x0800) #define HWC_LUT_ADDR (0x0c00) #define GAMMA_LUT_ADDR (0x1000) -#define CABC_LUT_ADDR (0x1800) +#define CABC_LUT_ADDR (0x2000) #define MCU_BYPASS_WPORT (0x2200) #define MCU_BYPASS_RPORT (0x2300) -- 2.34.1