From: Mark Yao <mark.yao@rock-chips.com>
Date: Thu, 26 Mar 2015 06:15:21 +0000 (+0800)
Subject: rk_fb: fix kernel logo display
X-Git-Tag: firefly_0821_release~4230
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=959b2148aedecebb9d41c9faae48a9235f2941c1;p=firefly-linux-kernel-4.4.55.git

rk_fb: fix kernel logo display

If we use origin kernel logo config, default path would not enable
iommu, we maybe get a black display.

so just enable iommu when we do fb_pan_display.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 31bdd472dfa7..ba713dc15e4d 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -1383,6 +1383,12 @@ 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;
 }