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

Commit 6ac0a18b authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: fix arguments of usleep_range function"

parents d67c9bd8 ca650b0f

drivers/gpu/drm/msm/dsi-staging/dsi_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static int dsi_panel_reset(struct dsi_panel *panel) 


		if (r_config->sequence[i].sleep_ms)

			usleep_range(r_config->sequence[i].sleep_ms * 1000,

				     r_config->sequence[i].sleep_ms * 1000);

				(r_config->sequence[i].sleep_ms * 1000) + 100);

	}



	if (gpio_is_valid(panel->bl_config.en_gpio)) {

drivers/gpu/drm/msm/sde_io_util.c

+8 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, 2017-2018 The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, 2017, 2018, The Linux Foundation.

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -242,7 +243,7 @@ int msm_dss_enable_vreg(struct dss_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);

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

			rc = regulator_set_load(in_vreg[i].vreg,

				in_vreg[i].enable_load);

			if (rc < 0) {
@@ -254,7 +255,7 @@ int msm_dss_enable_vreg(struct dss_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);

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

			if (rc < 0) {

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

					__builtin_return_address(0), __func__,
@@ -277,13 +278,13 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable) 
			}

			if (in_vreg[i].pre_off_sleep)

				usleep_range(in_vreg[i].pre_off_sleep * 1000,

					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].disable_load);

			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);

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

		}

	}

	return rc;
@@ -295,13 +296,13 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable) 
	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);

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

		regulator_set_load(in_vreg[i].vreg,

			in_vreg[i].disable_load);

		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);

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

	}



	return rc;