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

Commit bd2c8de4 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: increase mdp hw recovery timeout"

parents 035363ab 88239369

drivers/video/msm/mdss/mdss_mdp_ctl.c

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

/* Copyright (c) 2012-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
@@ -4328,9 +4328,11 @@ void mdss_mdp_check_ctl_reset_status(struct mdss_mdp_ctl *ctl) 
		return;



	pr_debug("hw ctl reset is set for ctl:%d\n", ctl->num);

	status = mdss_mdp_poll_ctl_reset_status(ctl, 5);

	/* poll for at least ~1 frame */

	status = mdss_mdp_poll_ctl_reset_status(ctl, 320);

	if (status) {

		pr_err("hw recovery is not complete for ctl:%d\n", ctl->num);

		pr_err("hw recovery is not complete for ctl:%d status:0x%x\n",

			ctl->num, status);

		MDSS_XLOG_TOUT_HANDLER("mdp", "vbif", "vbif_nrt", "dbg_bus",

			"vbif_dbg_bus", "panic");

	}