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

Commit df6700bf 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 display time out when taking ESD test"

parents 384adc2b 320e1da1

drivers/video/msm/mdss/dsi_host_v2.c

+5 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, 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
@@ -524,8 +524,11 @@ void msm_dsi_controller_cfg(int enable) 
	if (readl_poll_timeout((ctrl_base + DSI_STATUS),

				status,

				((status & 0x02) == 0),

				DSI_POLL_SLEEP_US, DSI_POLL_TIMEOUT_US))

				DSI_POLL_SLEEP_US, DSI_POLL_TIMEOUT_US)) {

		pr_err("%s: DSI status=%x failed\n", __func__, status);

		pr_err("%s: Doing sw reset\n", __func__);

		msm_dsi_sw_reset();

	}



	/* Check for x_HS_FIFO_EMPTY */

	if (readl_poll_timeout((ctrl_base + DSI_FIFO_STATUS),