From: hjc <hjc@rock-chips.com>
Date: Fri, 19 Jun 2015 06:22:42 +0000 (+0800)
Subject: vop: full: update win direct enable function
X-Git-Tag: firefly_0821_release~4006
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=45bddfa6a5f4a4cb01d1a64a3717dfe97abaebbd;p=firefly-linux-kernel-4.4.55.git

vop: full: update win direct enable function

Signed-off-by: hjc <hjc@rock-chips.com>
---

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;							\
 }