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

Commit 0b3e45b7 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: try recovering from PP timeout without panic"

parents d0a9fe7f 788ff7a7

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+1 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-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
@@ -1965,9 +1965,6 @@ static int mdss_mdp_cmd_wait4pingpong(struct mdss_mdp_ctl *ctl, void *arg) 
			mdss_fb_report_panel_dead(ctl->mfd);

		} else if (ctx->pp_timeout_report_cnt == 0) {

			MDSS_XLOG(0xbad);

			MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",

				"dsi1_ctrl", "dsi1_phy", "vbif", "vbif_nrt",

				"dbg_bus", "vbif_dbg_bus", "panic");

		} else if (ctx->pp_timeout_report_cnt == MAX_RECOVERY_TRIALS) {

			MDSS_XLOG(0xbad2);

			MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",