diff options
| author | Ingrid Gallardo <ingridg@codeaurora.org> | 2015-01-08 18:16:23 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:39:19 -0700 |
| commit | d4d841c63e49edc312c981063294da4f73616fb2 (patch) | |
| tree | 774148bc1d2d2098df194dae6564a9ea02494f7b | |
| parent | 002aa08637ddca1c021d42966e51c7ff9f04ad3c (diff) | |
msm: mdss: debugfs: xlog: display kernel panic cleanup
Cleanup the kernel panic within the display driver to
dump mdp registers before driver panics and remove
unnecessary panic during underrun interrupt.
Change-Id: Ia8cb125b2836096b4179463cb4d4e6d1bd6cd804
Signed-off-by: Ingrid Gallardo <ingridg@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_video.c | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pipe.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c index da79db1af662..5cf55f70fe40 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c @@ -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); diff --git a/drivers/video/fbdev/msm/mdss_mdp_pipe.c b/drivers/video/fbdev/msm/mdss_mdp_pipe.c index bacb55e70b4d..6b495ba17d14 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pipe.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pipe.c @@ -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) @@ -1237,7 +1238,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; @@ -1246,7 +1247,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); |