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

Commit 00effb29 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: debugfs: xlog: display kernel panic cleanup"

parents e166fa06 8df9b212

drivers/video/msm/mdss/mdss_mdp_intf_video.c

+0 −1
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ static void mdss_mdp_video_underrun_intr_done(void *arg) 


	ctl->underrun_cnt++;

	MDSS_XLOG(ctl->num, ctl->underrun_cnt);

	MDSS_XLOG_TOUT_HANDLER_WQ("mdp", "vbif", "panic");

	trace_mdp_video_underrun_done(ctl->num, ctl->underrun_cnt);

	pr_debug("display underrun detected for ctl=%d count=%d\n", ctl->num,

			ctl->underrun_cnt);

drivers/video/msm/mdss/mdss_mdp_pipe.c

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

/* Copyright (c) 2012-2015, 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
@@ -20,6 +20,7 @@ 


#include "mdss_mdp.h"

#include "mdss_mdp_trace.h"

#include "mdss_debug.h"



#define SMP_MB_SIZE		(mdss_res->smp_mb_size)

#define SMP_MB_CNT		(mdss_res->smp_mb_cnt)
@@ -1098,7 +1099,7 @@ static bool mdss_mdp_check_pipe_in_use(struct mdss_mdp_pipe *pipe) 
			pr_err("IN USE: mixer=%d pipe=%d mcfg:0x%x mask:0x%x\n",

				mixer->num, pipe->num,

				mixercfg, stage_off_mask);

			BUG();

			MDSS_XLOG_TOUT_HANDLER("mdp", "panic");

		}



		mixer = ctl->mixer_right;
@@ -1107,7 +1108,7 @@ static bool mdss_mdp_check_pipe_in_use(struct mdss_mdp_pipe *pipe) 
			pr_err("IN USE: mixer=%d pipe=%d mcfg:0x%x mask:0x%x\n",

				mixer->num, pipe->num,

				mixercfg, stage_off_mask);

			BUG();

			MDSS_XLOG_TOUT_HANDLER("mdp", "panic");

		}

	}

	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);