From ea74dadc77898a3fbc17e50abca935e9b480e422 Mon Sep 17 00:00:00 2001 From: hjc Date: Thu, 26 Feb 2015 18:27:40 +0800 Subject: [PATCH] rk fb: if uboot-logo-on set 1, open iommu when iommu en Signed-off-by: hjc --- drivers/video/rockchip/rk_fb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) mode change 100644 => 100755 drivers/video/rockchip/rk_fb.c diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c old mode 100644 new mode 100755 index 25fa86b2a097..ebe1aace5eb6 --- 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); -- 2.34.1