Merge "msm: mdss: Fix Iommu page fault for splash logo enabled feature"
diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_video.c b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
index 6642544..7745c7c 100644
--- a/drivers/video/msm/mdss/mdss_mdp_intf_video.c
+++ b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -722,8 +722,10 @@
pr_debug("enabling timing gen for intf=%d\n", ctl->intf_num);
- if (pdata->panel_info.cont_splash_enabled &&
- !ctl->mfd->splash_info.splash_logo_enabled) {
+ if ((pdata->panel_info.cont_splash_enabled &&
+ !ctl->mfd->splash_info.splash_logo_enabled)
+ || (ctl->mfd->splash_info.splash_logo_enabled
+ && !is_mdss_iommu_attached())) {
rc = wait_for_completion_timeout(&ctx->vsync_comp,
usecs_to_jiffies(VSYNC_TIMEOUT_US));
}
diff --git a/drivers/video/msm/mdss/mdss_mdp_splash_logo.c b/drivers/video/msm/mdss/mdss_mdp_splash_logo.c
index 829806d..93f7d30 100644
--- a/drivers/video/msm/mdss/mdss_mdp_splash_logo.c
+++ b/drivers/video/msm/mdss/mdss_mdp_splash_logo.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -466,7 +466,6 @@
if (!sinfo->frame_done_count) {
mdss_mdp_splash_unmap_splash_mem(mfd);
- mdss_mdp_splash_cleanup(mfd, false);
/* wait for 2 frame done events before releasing memory */
} else if (sinfo->frame_done_count > MAX_FRAME_DONE_COUNT_WAIT &&
sinfo->splash_thread) {