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

Commit f14685b7 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: ensure proper state transition during ULPS exit"

parents cb4cc445 23b66855

drivers/video/msm/mdss/msm_mdss_io_8974.c

+3 −1
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -1796,8 +1796,10 @@ static int mdss_dsi_ulps_config(struct mdss_dsi_ctrl_pdata *ctrl, 
		 * to be in stop state.

		 * to be in stop state.

		 */

		 */

		MIPI_OUTP(ctrl->ctrl_base + 0x0AC, active_lanes << 16);

		MIPI_OUTP(ctrl->ctrl_base + 0x0AC, active_lanes << 16);

		wmb(); /* ensure lanes are put to stop state */





		MIPI_OUTP(ctrl->ctrl_base + 0x0AC, 0x0);

		MIPI_OUTP(ctrl->ctrl_base + 0x0AC, 0x0);

		wmb(); /* ensure lanes are in proper state */





		/*

		/*

		 * Wait for a short duration before enabling

		 * Wait for a short duration before enabling