Merge "msm: mdss: Unblock mdp PP features when AD calib mode is enabled" (b1f1ea81) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -1734,10 +1734,6 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer)
		ad_flags = 0;
		}

		/* call calibration specific processing here */
		if (ctl->mfd->calib_mode)
		goto flush_exit;

		/* nothing to update */
		if ((!flags) && (!(opmode)) && (!ad_flags))
		goto dspp_exit;
		@@ -1800,7 +1796,6 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer)
		opmode_config:
		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;