video: rockchip: vop: 3399: fix afbdc abnormal

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / lcdc / rk3036_lcdc.c

diff --git a/drivers/video/rockchip/lcdc/rk3036_lcdc.c b/drivers/video/rockchip/lcdc/rk3036_lcdc.c
index c01520c4161906990f7cab595b9a874c198a814a..dbaf15bfafe4c72448ba72d43f2e2296315629a2 100755 (executable)
--- a/drivers/video/rockchip/lcdc/rk3036_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3036_lcdc.c
@@ -728,7 +728,6 @@ static int rk3036_lcdc_open(struct rk_lcdc_driver *dev_drv, int win_id,
        if ((open) && (!lcdc_dev->atv_layer_cnt)) {
                rk3036_lcdc_pre_init(dev_drv);
                rk3036_lcdc_clk_enable(lcdc_dev);
-       #if defined(CONFIG_ROCKCHIP_IOMMU)
                if (dev_drv->iommu_enabled) {
                        if (!dev_drv->mmu_dev) {
                                dev_drv->mmu_dev =
@@ -745,7 +744,6 @@ static int rk3036_lcdc_open(struct rk_lcdc_driver *dev_drv, int win_id,
                                }
                        }
                }
-       #endif
                rk3036_lcdc_reg_restore(lcdc_dev);
                /*if (dev_drv->iommu_enabled)
                        rk3036_lcdc_mmu_en(dev_drv);*/
@@ -767,12 +765,10 @@ static int rk3036_lcdc_open(struct rk_lcdc_driver *dev_drv, int win_id,
        if ((!open) && (!lcdc_dev->atv_layer_cnt)) {
                rk3036_lcdc_disable_irq(lcdc_dev);
                rk3036_lcdc_reg_update(dev_drv);
-               #if defined(CONFIG_ROCKCHIP_IOMMU)
                if (dev_drv->iommu_enabled) {
                        if (dev_drv->mmu_dev)
                                rockchip_iovmm_deactivate(dev_drv->dev);
                }
-               #endif
                rk3036_lcdc_clk_disable(lcdc_dev);
        }
 */
@@ -1156,7 +1152,6 @@ static int rk3036_lcdc_cfg_done(struct rk_lcdc_driver *dev_drv)
 
        spin_lock(&lcdc_dev->reg_lock);
        if (lcdc_dev->clk_on) {
-               #if defined(CONFIG_ROCKCHIP_IOMMU)
                if (dev_drv->iommu_enabled) {
                        if (!lcdc_dev->iommu_status && dev_drv->mmu_dev) {
                                lcdc_dev->iommu_status = 1;
@@ -1174,7 +1169,6 @@ static int rk3036_lcdc_cfg_done(struct rk_lcdc_driver *dev_drv)
                                rk3036_lcdc_mmu_en(dev_drv);
                        }
                }
-               #endif
                lcdc_msk_reg(lcdc_dev, SYS_CTRL, m_LCDC_STANDBY,
                             v_LCDC_STANDBY(lcdc_dev->standby));
                for (i = 0; i < ARRAY_SIZE(lcdc_win); i++) {
@@ -1551,14 +1545,10 @@ static int rk3036_lcdc_parse_dt(struct lcdc_device *lcdc_dev)
        struct device_node *np = lcdc_dev->dev->of_node;
        int val;
 
-#if defined(CONFIG_ROCKCHIP_IOMMU)
        if (of_property_read_u32(np, "rockchip,iommu-enabled", &val))
                lcdc_dev->driver.iommu_enabled = 0;
        else
                lcdc_dev->driver.iommu_enabled = val;
-#else
-       lcdc_dev->driver.iommu_enabled = 0;
-#endif
        if (of_property_read_u32(np, "rockchip,fb-win-map", &val))
                lcdc_dev->driver.fb_win_map = FB_DEFAULT_ORDER;
        else