From 06674ea0a264ae582b8e742f7861a757438e5a7f Mon Sep 17 00:00:00 2001 From: Mark Yao Date: Thu, 26 Mar 2015 14:26:24 +0800 Subject: [PATCH] hjc already fix this problem, so Revert "rk_fb: fix kernel logo display" This reverts commit 959b2148aedecebb9d41c9faae48a9235f2941c1. fixed by: commit ad5ae9748644e16522b034a9a3ec5818cc10ec48 Author: hjc Date: Thu Feb 26 18:27:40 2015 +0800 rk fb: if uboot-logo-on set 1, open iommu when iommu en --- drivers/video/rockchip/rk_fb.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c index ba713dc15e4d..31bdd472dfa7 100644 --- a/drivers/video/rockchip/rk_fb.c +++ b/drivers/video/rockchip/rk_fb.c @@ -1383,12 +1383,6 @@ static int rk_fb_pan_display(struct fb_var_screeninfo *var, if (likely((var->reserved[3] & 0x1) == 0)) dev_drv->ops->cfg_done(dev_drv); - if (dev_drv->iommu_enabled) { - rk_fb_poll_wait_frame_complete(); - if (dev_drv->ops->mmu_en) - dev_drv->ops->mmu_en(dev_drv); - } - return 0; } -- 2.34.1