From 45bddfa6a5f4a4cb01d1a64a3717dfe97abaebbd Mon Sep 17 00:00:00 2001 From: hjc Date: Fri, 19 Jun 2015 14:22:42 +0800 Subject: [PATCH] vop: full: update win direct enable function Signed-off-by: hjc --- drivers/video/rockchip/lcdc/rk3288_lcdc.c | 4 ++-- drivers/video/rockchip/lcdc/rk3368_lcdc.c | 4 ++-- 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 8d333957aa3c..6ef06dbe53ad 100755 --- a/drivers/video/rockchip/lcdc/rk3288_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.c @@ -217,10 +217,10 @@ static int win##id##_enable(struct lcdc_device *lcdc_dev, int en) \ val = v_WIN##id##_EN(en); \ lcdc_msk_reg(lcdc_dev, WIN##id##_CTRL0, msk, val); \ lcdc_cfg_done(lcdc_dev); \ - val = lcdc_read_bit(lcdc_dev, WIN##id##_CTRL0, msk); \ + /*val = lcdc_read_bit(lcdc_dev, WIN##id##_CTRL0, msk); \ while (val != (!!en)) { \ val = lcdc_read_bit(lcdc_dev, WIN##id##_CTRL0, msk); \ - } \ + }*/ \ spin_unlock(&lcdc_dev->reg_lock); \ return 0; \ } diff --git a/drivers/video/rockchip/lcdc/rk3368_lcdc.c b/drivers/video/rockchip/lcdc/rk3368_lcdc.c index 3d298eda42f2..d2e81d3b94d1 100755 --- a/drivers/video/rockchip/lcdc/rk3368_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3368_lcdc.c @@ -279,10 +279,10 @@ static int win##id##_enable(struct lcdc_device *lcdc_dev, int en) \ val = v_WIN##id##_EN(en); \ lcdc_msk_reg(lcdc_dev, WIN##id##_CTRL0, msk, val); \ lcdc_cfg_done(lcdc_dev); \ - val = lcdc_read_bit(lcdc_dev, WIN##id##_CTRL0, msk); \ + /*val = lcdc_read_bit(lcdc_dev, WIN##id##_CTRL0, msk); \ while (val != (!!en)) { \ val = lcdc_read_bit(lcdc_dev, WIN##id##_CTRL0, msk); \ - } \ + }*/ \ spin_unlock(&lcdc_dev->reg_lock); \ return 0; \ } -- 2.34.1