Merge "msm: mdss: update the pp status flags for layermixer" (e3c14be6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -343,7 +343,7 @@ struct mdss_pp_res_type {
	struct mdp_gamut_cfg_data gamut_disp_cfg[MDSS_BLOCK_DISP_NUM];		struct mdp_gamut_cfg_data gamut_disp_cfg[MDSS_BLOCK_DISP_NUM];
	uint16_t gamut_tbl[MDSS_BLOCK_DISP_NUM][GAMUT_TOTAL_TABLE_SIZE];		uint16_t gamut_tbl[MDSS_BLOCK_DISP_NUM][GAMUT_TOTAL_TABLE_SIZE];
	u32 hist_data[MDSS_BLOCK_DISP_NUM][HIST_V_SIZE];		u32 hist_data[MDSS_BLOCK_DISP_NUM][HIST_V_SIZE];
	struct pp_sts_type pp_disp_sts[MDSS_BLOCK_DISP_NUM];		struct pp_sts_type pp_disp_sts[MDSS_MAX_MIXER_DISP_NUM];
	/* physical info */		/* physical info */
	struct pp_hist_col_info *dspp_hist;		struct pp_hist_col_info *dspp_hist;
	};		};
	@@ -1744,6 +1744,11 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer)

	pp_sts = &mdss_pp_res->pp_disp_sts[disp_num];		pp_sts = &mdss_pp_res->pp_disp_sts[disp_num];

			if (!flags) {
			pr_debug("skip configuring dspp features\n");
			goto opmode_config;
			}

	if (mdata->mdp_rev >= MDSS_MDP_HW_REV_103) {		if (mdata->mdp_rev >= MDSS_MDP_HW_REV_103) {
	pp_pa_v2_config(flags, base + MDSS_MDP_REG_DSPP_PA_BASE, pp_sts,		pp_pa_v2_config(flags, base + MDSS_MDP_REG_DSPP_PA_BASE, pp_sts,
	&mdss_pp_res->pa_v2_disp_cfg[disp_num],		&mdss_pp_res->pa_v2_disp_cfg[disp_num],
	@@ -1792,7 +1797,7 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer)
	pp_sts->pgc_sts \|= PP_STS_ENABLE;		pp_sts->pgc_sts \|= PP_STS_ENABLE;
	pp_sts_set_split_bits(&pp_sts->pgc_sts, pgc_config->flags);		pp_sts_set_split_bits(&pp_sts->pgc_sts, pgc_config->flags);
	}		}
			opmode_config:
	pp_dspp_opmode_config(ctl, dspp_num, pp_sts, mdata->mdp_rev, &opmode);		pp_dspp_opmode_config(ctl, dspp_num, pp_sts, mdata->mdp_rev, &opmode);

	flush_exit:		flush_exit: