projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8dde4c0
)
rk fb: if uboot-logo-on set 1, open iommu when iommu en
author
hjc
<hjc@rock-chips.com>
Thu, 26 Feb 2015 10:27:40 +0000
(18:27 +0800)
committer
hjc
<hjc@rock-chips.com>
Thu, 26 Feb 2015 10:27:40 +0000
(18:27 +0800)
Signed-off-by: hjc <hjc@rock-chips.com>
drivers/video/rockchip/rk_fb.c
[changed mode: 0644->0755]
patch
|
blob
|
history
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 {
}
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);
}
#if defined(CONFIG_LOGO)
main_fbi->fbops->fb_set_par(main_fbi);