summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenet Clark <benetc@codeaurora.org>2014-03-19 14:56:23 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:28:23 -0700
commit54822d96b647de47428842c58a7bc8ab08323bba (patch)
treead1dc8c2720dd71621d173de6beef589f2fd66e4
parent1244fc88fc3318e2922fbde377979bb4ac218abe (diff)
msm: mdss: Add error message when histogram bin collection is incorrect
In the cases where histogram bin collection does not return the expected number of bins, we return an error, however we do not print any error message saying which DSPP had failed bin collection. In order to know which pipe the histogram failed on, we must add an extra log. Change-Id: I1fb39e146cd3367d3b97f10174573a5207284652 Signed-off-by: Benet Clark <benetc@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pp.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c
index c457a3616fed..75f9415aecd3 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c
@@ -3597,8 +3597,11 @@ static int pp_hist_collect(struct mdp_histogram_data *hist,
if (is_hist_v2)
writel_relaxed(0, ctl_base);
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
- if (expect_sum && sum != expect_sum)
+ if (expect_sum && sum != expect_sum) {
+ pr_debug("hist error: bin sum incorrect! (%d/%d)\n",
+ sum, expect_sum);
ret = -ENODATA;
+ }
} else {
spin_unlock_irqrestore(&hist_info->hist_lock, flag);
}
@@ -3665,6 +3668,9 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist)
temp_ret = ret;
ret = pp_hist_collect(hist, hists[i], ctl_base,
exp_sum);
+ if (ret)
+ pr_debug("hist error: dspp[%d] collect %d\n",
+ dspp_num, ret);
}
for (i = 0; i < hist_cnt; i++) {
/* reset read requests and re-intialize completions */
@@ -3762,6 +3768,10 @@ int mdss_mdp_hist_collect(struct mdp_histogram_data *hist)
temp_ret = ret;
ret = pp_hist_collect(hist, hist_info, ctl_base,
exp_sum);
+ if (ret)
+ pr_debug("hist error: pipe[%d] collect: %d\n",
+ pipe->num, ret);
+
mdss_mdp_pipe_unmap(pipe);
}
for (i = pipe_num; i < MDSS_PP_ARG_NUM; i++) {