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

Commit f2e17892 authored by Gopikrishnaiah Anandan's avatar Gopikrishnaiah Anandan Committed by Matt Wagantall
Browse files

msm: mdss: decouple histogram stop from control mixers 



When histogram is started for a logical display we store the display
number as part of histogram info structure. When histogram stop is
called on a logical display control mixers might be turned off in case
of suspend usecase which will fail histogram stop ioctl. Since driver is
caching the display number, histogram for the dspp's which are attached
to logical display can be turned off without need for checking control
mixers.

Change-Id: I4f06f5aad562ff3a3df5449166b7d174d3e800eb
Signed-off-by: default avatarGopikrishnaiah Anandan <agopik@codeaurora.org>
parent e03111ed

drivers/video/msm/mdss/mdss_mdp_pp.c

+7 −27
Original line number Diff line number Diff line
@@ -4009,9 +4009,8 @@ exit: 
int mdss_mdp_hist_stop(u32 block)

{

	int i, ret = 0;

	u32 dspp_num, disp_num;

	u32 disp_num;

	struct pp_hist_col_info *hist_info;

	u32 mixer_cnt, mixer_id[MDSS_MDP_INTF_MAX_LAYERMIXER];

	struct mdss_mdp_pipe *pipe;

	struct mdss_data_type *mdata = mdss_mdp_get_mdata();
@@ -4056,36 +4055,17 @@ int mdss_mdp_hist_stop(u32 block) 
				(PP_BLOCK(block) >= MDP_BLOCK_MAX))

			goto hist_stop_clk;



		disp_num = PP_BLOCK(block) - MDP_LOGICAL_BLOCK_DISP_0;

		mixer_cnt = mdss_mdp_get_ctl_mixers(disp_num, mixer_id);



		if (!mixer_cnt) {

			pr_err("%s, no dspp connects to disp %d\n",

					__func__, disp_num);

			ret = -EPERM;

			goto hist_stop_clk;

		}

		if (mixer_cnt > mdata->nmixers_intf) {

			pr_err("%s, Too many dspp connects to disp %d\n",

					__func__, mixer_cnt);

			ret = -EPERM;

			goto hist_stop_clk;

		}



		for (i = 0; i < mixer_cnt; i++) {

			dspp_num = mixer_id[i];

			if (dspp_num >= mdata->ndspp) {

				ret = -EINVAL;

				pr_warn("Invalid dspp num %d\n", dspp_num);

				goto hist_stop_clk;

			}

			hist_info = &mdss_pp_res->dspp_hist[dspp_num];

		disp_num = PP_BLOCK(block);

		for (i = 0; i < mdata->ndspp; i++) {

			hist_info = &mdss_pp_res->dspp_hist[i];

			if (disp_num != hist_info->disp_num)

				continue;

			ret = pp_hist_disable(hist_info);

			hist_info->disp_num = 0;

			hist_info->ctl = NULL;

			if (ret)

				goto hist_stop_clk;

			mdss_pp_res->pp_disp_flags[disp_num] |=

			mdss_pp_res->pp_disp_flags[i] |=

							PP_FLAGS_DIRTY_HIST_COL;

		}

	}