summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenet Clark <benetc@codeaurora.org>2014-03-10 20:28:22 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:28:05 -0700
commit8d9557d69d20128ffb65ff8d03dae542d38ba8a9 (patch)
treea31ae52469900da7da4df0bb3b7109a0d7967d79
parentfe64bfa426b3696ffabfd0e2c80aabb7bcc7e605 (diff)
msm: mdss: Move histogram completion initialization to pp_init
The histogram completion structures are initialized in pp_init, in order to avoid the wait_queue initialization being called multiple times. The init_completion in hist_enable has been replaced with a safer function that does not modify the wait_queue. Change-Id: If4dfc6a74069d9adc867131201e6f74c3c81c1ac Signed-off-by: Benet Clark <benetc@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c
index 9519738b8e72..969e2f07f06e 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c
@@ -1904,6 +1904,7 @@ int mdss_mdp_pp_init(struct device *dev)
hist[i].base =
mdss_mdp_get_dspp_addr_off(i) +
MDSS_MDP_REG_DSPP_HIST_CTL_BASE;
+ init_completion(&hist[i].comp);
}
mdss_pp_res->dspp_hist = hist;
}
@@ -1917,6 +1918,7 @@ int mdss_mdp_pp_init(struct device *dev)
vig[i].pp_res.hist.intr_shift = (vig[i].num * 4);
vig[i].pp_res.hist.base = vig[i].base +
MDSS_MDP_REG_VIG_HIST_CTL_BASE;
+ init_completion(&vig[i].pp_res.hist.comp);
}
if (!mdata->pp_bus_hdl) {
pp_bus_pdata = &mdp_pp_bus_scale_table;
@@ -3136,7 +3138,7 @@ static int pp_hist_enable(struct pp_hist_col_info *hist_info,
goto exit;
}
hist_info->frame_cnt = req->frame_cnt;
- init_completion(&hist_info->comp);
+ INIT_COMPLETION(hist_info->comp);
hist_info->hist_cnt_read = 0;
hist_info->hist_cnt_sent = 0;
hist_info->hist_cnt_time = 0;