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

Commit cba92f62 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 calls to usleep_range function in mdss driver"

parents 133e62e2 cc3789e1

drivers/video/fbdev/msm/dsi_host_v2.c

+2 −2
Original line number Diff line number Diff line
@@ -753,8 +753,8 @@ static int msm_dsi_cmds_tx(struct mdss_dsi_ctrl_pdata *ctrl, 
			}



			if (dchdr->wait)

				usleep_range(dchdr->wait * 1000,

					     dchdr->wait * 1000);

				usleep_range((dchdr->wait * 1000),

					     (dchdr->wait * 1000) + 10);



			mdss_dsi_buf_init(tp);

			len = 0;

drivers/video/fbdev/msm/mdss_dsi_host.c

+2 −2
Original line number Diff line number Diff line
@@ -1698,8 +1698,8 @@ static int mdss_dsi_cmds2buf_tx(struct mdss_dsi_ctrl_pdata *ctrl, 
					__func__,  cm->payload[0], len);



			if (!wait || dchdr->wait > VSYNC_PERIOD)

				usleep_range(dchdr->wait * 1000,

					     dchdr->wait * 1000);

				usleep_range((dchdr->wait * 1000),

					     (dchdr->wait * 1000) + 10);



			mdss_dsi_buf_init(tp);

			len = 0;

drivers/video/fbdev/msm/mdss_dsi_panel.c

+2 −2
Original line number Diff line number Diff line
@@ -445,8 +445,8 @@ int mdss_dsi_panel_reset(struct mdss_panel_data *pdata, int enable) 
				gpio_set_value((ctrl_pdata->rst_gpio),

					pdata->panel_info.rst_seq[i]);

				if (pdata->panel_info.rst_seq[++i])

					usleep_range(pinfo->rst_seq[i] * 1000,

						     pinfo->rst_seq[i] * 1000);

					usleep_range((pinfo->rst_seq[i] * 1000),

					(pinfo->rst_seq[i] * 1000) + 10);

			}



			if (gpio_is_valid(ctrl_pdata->bklt_en_gpio)) {

drivers/video/fbdev/msm/mdss_io_util.c

+12 −12
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ int msm_mdss_enable_vreg(struct mdss_vreg *in_vreg, int num_vreg, int enable) 
			}

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

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

				usleep_range(in_vreg[i].pre_on_sleep * 1000,

					in_vreg[i].pre_on_sleep * 1000);

				usleep_range((in_vreg[i].pre_on_sleep * 1000),

					(in_vreg[i].pre_on_sleep * 1000) + 10);

			rc = regulator_set_load(in_vreg[i].vreg,

				in_vreg[i].load[DSS_REG_MODE_ENABLE]);

			if (rc < 0) {
@@ -287,8 +287,8 @@ int msm_mdss_enable_vreg(struct mdss_vreg *in_vreg, int num_vreg, int enable) 
			}

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

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

				usleep_range(in_vreg[i].post_on_sleep * 1000,

					in_vreg[i].post_on_sleep * 1000);

				usleep_range((in_vreg[i].post_on_sleep * 1000),

					(in_vreg[i].post_on_sleep * 1000) + 10);

			if (rc < 0) {

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

					__builtin_return_address(0), __func__,
@@ -299,8 +299,8 @@ int msm_mdss_enable_vreg(struct mdss_vreg *in_vreg, int num_vreg, int enable) 
	} else {

		for (i = num_vreg-1; i >= 0; i--) {

			if (in_vreg[i].pre_off_sleep)

				usleep_range(in_vreg[i].pre_off_sleep * 1000,

					in_vreg[i].pre_off_sleep * 1000);

				usleep_range((in_vreg[i].pre_off_sleep * 1000),

					(in_vreg[i].pre_off_sleep * 1000) + 10);

			regulator_set_load(in_vreg[i].vreg,

				in_vreg[i].load[DSS_REG_MODE_DISABLE]);
@@ -308,8 +308,8 @@ int msm_mdss_enable_vreg(struct mdss_vreg *in_vreg, int num_vreg, int enable) 
				regulator_disable(in_vreg[i].vreg);



			if (in_vreg[i].post_off_sleep)

				usleep_range(in_vreg[i].post_off_sleep * 1000,

					in_vreg[i].post_off_sleep * 1000);

				usleep_range((in_vreg[i].post_off_sleep * 1000),

				(in_vreg[i].post_off_sleep * 1000) + 10);

		}

	}

	return rc;
@@ -321,14 +321,14 @@ int msm_mdss_enable_vreg(struct mdss_vreg *in_vreg, int num_vreg, int enable) 
vreg_set_opt_mode_fail:

	for (i--; i >= 0; i--) {

		if (in_vreg[i].pre_off_sleep)

			usleep_range(in_vreg[i].pre_off_sleep * 1000,

				in_vreg[i].pre_off_sleep * 1000);

			usleep_range((in_vreg[i].pre_off_sleep * 1000),

				(in_vreg[i].pre_off_sleep * 1000) + 10);

		regulator_set_load(in_vreg[i].vreg,

			in_vreg[i].load[DSS_REG_MODE_DISABLE]);

		regulator_disable(in_vreg[i].vreg);

		if (in_vreg[i].post_off_sleep)

			usleep_range(in_vreg[i].post_off_sleep * 1000,

				in_vreg[i].post_off_sleep * 1000);

			usleep_range((in_vreg[i].post_off_sleep * 1000),

				(in_vreg[i].post_off_sleep * 1000) + 10);

	}



	return rc;