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

Commit 5a5fce06 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Fix pp resume failure"

parents 793d8512 1d68eef8

drivers/video/msm/mdss/mdss_mdp_overlay.c

+8 −8
Original line number Diff line number Diff line
@@ -1403,14 +1403,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
@@ -1426,6 +1418,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;