Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e5b6573 authored by Sravan Kumar D.V.N's avatar Sravan Kumar D.V.N Committed by Harsh Sahu
Browse files

msm: mdss: Fix pp resume failure 



Ensure that mixer object is present before calling
pp resume.

Change-Id: I18145fb89d33334dc9427ff1c2c4d85a957d6914
Signed-off-by: default avatarSravan Kumar D.V.N <sravank1@codeaurora.org>
parent c0c3313c

drivers/video/fbdev/msm/mdss_mdp_overlay.c

+8 −8
Original line number Diff line number Diff line
@@ -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;