Merge "msm: mdss: Add error message when histogram bin collection is incorrect" (a10bce24) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -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++) {