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

Commit 07a1122b 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: Add check for enabled regulators to avoid delays"

parents d0b89f39 37a16eeb

drivers/video/msm/mdss/mdss_io_util.c

+4 −2
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ EXPORT_SYMBOL(msm_dss_config_vreg); 
int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable)

{

	int i = 0, rc = 0;

	bool need_sleep;

	if (enable) {

		for (i = 0; i < num_vreg; i++) {

			rc = PTR_RET(in_vreg[i].vreg);
@@ -220,7 +221,8 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable) 
					in_vreg[i].vreg_name, rc);

				goto vreg_set_opt_mode_fail;

			}

			if (in_vreg[i].pre_on_sleep)

			need_sleep = !regulator_is_enabled(in_vreg[i].vreg);

			if (in_vreg[i].pre_on_sleep && need_sleep)

				msleep(in_vreg[i].pre_on_sleep);

			rc = regulator_set_optimum_mode(in_vreg[i].vreg,

				in_vreg[i].enable_load);
@@ -231,7 +233,7 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable) 
				goto vreg_set_opt_mode_fail;

			}

			rc = regulator_enable(in_vreg[i].vreg);

			if (in_vreg[i].post_on_sleep)

			if (in_vreg[i].post_on_sleep && need_sleep)

				msleep(in_vreg[i].post_on_sleep);

			if (rc < 0) {

				DEV_ERR("%pS->%s: %s enable failed\n",