Merge "msm: mdss: Allow AD register programming in AD calibration mode" (40de9577) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1529,6 +1529,9 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer)
		pp_sts_set_split_bits(&pp_sts->pgc_sts, pgc_config->flags);
		}

		pp_dspp_opmode_config(ctl, dspp_num, pp_sts, mdata->mdp_rev, &opmode);

		flush_exit:
		if (ad_hw) {
		mutex_lock(&ad->lock);
		ad_flags = ad->reg_sts;
		@@ -1543,8 +1546,6 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer)
		mutex_unlock(&ad->lock);
		}

		pp_dspp_opmode_config(ctl, dspp_num, pp_sts, mdata->mdp_rev, &opmode);
		flush_exit:
		writel_relaxed(opmode, base + MDSS_MDP_REG_DSPP_OP_MODE);

		if (dspp_num == MDSS_MDP_DSPP3)