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

Commit 6c1a3eda authored by Benet Clark's avatar Benet Clark
Browse files

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: default avatarBenet Clark <benetc@codeaurora.org>
parent 52ed6048

drivers/video/msm/mdss/mdss_mdp_pp.c

+11 −1
Original line number Diff line number Diff line
@@ -3501,8 +3501,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);

	}
@@ -3569,6 +3572,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 */
@@ -3666,6 +3672,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++) {