hjc already fix this problem, so
authorMark Yao <mark.yao@rock-chips.com>
Thu, 26 Mar 2015 06:26:24 +0000 (14:26 +0800)
committerMark Yao <mark.yao@rock-chips.com>
Thu, 26 Mar 2015 06:29:40 +0000 (14:29 +0800)
Revert "rk_fb: fix kernel logo display"

This reverts commit 959b2148aedecebb9d41c9faae48a9235f2941c1.
fixed by:
  commit ad5ae9748644e16522b034a9a3ec5818cc10ec48
  Author: hjc <hjc@rock-chips.com>
  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

index ba713dc15e4d9d9692ff98d78175bf532df14a05..31bdd472dfa7834420f296c4a61300a1dd4cee06 100644 (file)
@@ -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;
 }