diff options
| author | Sravan Kumar D.V.N <sravank1@codeaurora.org> | 2016-05-10 13:01:34 +0530 |
|---|---|---|
| committer | Harsh Sahu <hsahu@codeaurora.org> | 2016-11-11 12:13:05 -0800 |
| commit | 0e5b65737dc2c448bd54ebc3c1c39d62df29372e (patch) | |
| tree | 1d2f0ebbf4e3e24deeaad9e250ce8ed1860db8cb | |
| parent | c0c3313cac1566e0c6b0aa67013ee14171742201 (diff) | |
msm: mdss: Fix pp resume failure
Ensure that mixer object is present before calling
pp resume.
Change-Id: I18145fb89d33334dc9427ff1c2c4d85a957d6914
Signed-off-by: Sravan Kumar D.V.N <sravank1@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_overlay.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c index 4004dc6bc058..ab4a1ad35a6d 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c +++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c @@ -1404,14 +1404,6 @@ int mdss_mdp_overlay_start(struct msm_fb_data_type *mfd) mdss_iommu_ctrl(0); } - /* Restore any previously configured PP features by resetting the dirty - * bits for enabled features. The dirty bits will be consumed during the - * first display commit when the PP hardware blocks are updated - */ - rc = mdss_mdp_pp_resume(mfd); - if (rc && (rc != -EPERM) && (rc != -ENODEV)) - pr_err("PP resume err %d\n", rc); - /* * Increment the overlay active count prior to calling ctl_start. * This is needed to ensure that if idle power collapse kicks in @@ -1427,6 +1419,14 @@ int mdss_mdp_overlay_start(struct msm_fb_data_type *mfd) goto ctl_error; } + /* Restore any previously configured PP features by resetting the dirty + * bits for enabled features. The dirty bits will be consumed during the + * first display commit when the PP hardware blocks are updated + */ + rc = mdss_mdp_pp_resume(mfd); + if (rc && (rc != -EPERM) && (rc != -ENODEV)) + pr_err("PP resume err %d\n", rc); + rc = mdss_mdp_splash_cleanup(mfd, true); if (!rc) goto end; |