evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: mdss: Balance clock requests in histogram enable

Browse source 
Balance the clock requests in histogram enable to prevent clocks from being
left on.

Change-Id: I45fc029049b68cceb56d0dc40f7819aca0625a58
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
This commit is contained in:
Carl Vanderlip 2013-10-25 12:04:26 -07:00 • committed by David Keitel
parent 94b2cc41bd
commit 7c8c5976a7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/video/fbdev/msm/mdss_mdp_pp.c
View file

@ -2771,7 +2771,7 @@ int mdss_mdp_histogram_start(struct mdp_histogram_start_req *req)
if (!i) { if (!i) {
ret = -EINVAL; ret = -EINVAL;
pr_warn("Must pass pipe arguments, %d", i); pr_warn("Must pass pipe arguments, %d", i);
goto hist_exit; goto hist_stop_clk;
} }
for (i = 0; i < MDSS_PP_ARG_NUM; i++) { for (i = 0; i < MDSS_PP_ARG_NUM; i++) {
@ -2781,10 +2781,9 @@ int mdss_mdp_histogram_start(struct mdp_histogram_start_req *req)
if (IS_ERR_OR_NULL(pipe)) if (IS_ERR_OR_NULL(pipe))
continue; continue;
if (!pipe || pipe->num > MDSS_MDP_SSPP_VIG2) { if (!pipe || pipe->num > MDSS_MDP_SSPP_VIG2) {
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
ret = -EINVAL; ret = -EINVAL;
pr_warn("Invalid Hist pipe (%d)", i); pr_warn("Invalid Hist pipe (%d)", i);
goto hist_exit; goto hist_stop_clk;
} }
done_shift_bit = (pipe->num * 4); done_shift_bit = (pipe->num * 4);
hist_info = &pipe->pp_res.hist; hist_info = &pipe->pp_res.hist;
@ -2807,8 +2806,8 @@ int mdss_mdp_histogram_start(struct mdp_histogram_start_req *req)
PP_FLAGS_DIRTY_HIST_COL; PP_FLAGS_DIRTY_HIST_COL;
} }
} }
hist_stop_clk:
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false); mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
hist_exit: hist_exit:
return ret; return ret;
} }