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

Commit 89a5bcf2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Move histogram completion initialization to pp_init"

parents 025c4d7c 4c048f47

drivers/video/msm/mdss/mdss_mdp_pp.c

+3 −1
Original line number Diff line number Diff line
@@ -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;