rk fb: if uboot-logo-on set 1, open iommu when iommu en

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

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
old mode 100644 (file)
new mode 100755 (executable)
index 25fa86b..ebe1aac
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -3756,9 +3756,12 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
                        }
                        return 0;
                } else {
-                       if (dev_drv->ops->mmu_en)
-                               dev_drv->ops->mmu_en(dev_drv);
-                       freed_index = 0;
+                       if (dev_drv->iommu_enabled) {
+                               rk_fb_poll_wait_frame_complete();
+                               if (dev_drv->ops->mmu_en)
+                                       dev_drv->ops->mmu_en(dev_drv);
+                               freed_index = 0;
+                       }
                }
 #if defined(CONFIG_LOGO)
                main_fbi->fbops->fb_set_par(main_fbi);