Merge "msm: mdss: Correct ARGC read write for all DSPP" (ed9f58a8) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -2667,6 +2667,12 @@ int mdss_mdp_argc_config(struct mdp_pgc_lut_data *config,
		mutex_lock(&mdss_pp_mutex);

		disp_num = PP_BLOCK(config->block) - MDP_LOGICAL_BLOCK_DISP_0;
		ret = pp_get_dspp_num(disp_num, &dspp_num);
		if (ret) {
		pr_err("%s, no dspp connects to disp %d", __func__, disp_num);
		goto argc_config_exit;
		}

		switch (PP_LOCAT(config->block)) {
		case MDSS_PP_LM_CFG:
		argc_addr = mdss_mdp_get_mixer_addr_off(dspp_num) +
		@@ -2692,12 +2698,6 @@ int mdss_mdp_argc_config(struct mdp_pgc_lut_data *config,
		tbl_size = GC_LUT_SEGMENTS * sizeof(struct mdp_ar_gc_lut_data);

		if (config->flags & MDP_PP_OPS_READ) {
		ret = pp_get_dspp_num(disp_num, &dspp_num);
		if (ret) {
		pr_err("%s, no dspp connects to disp %d",
		__func__, disp_num);
		goto argc_config_exit;
		}
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		local_cfg = *config;
		local_cfg.r_data =