Merge "msm: mdss: Prevent AD configuration on HDMI path" (c37fff03) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1728,7 +1728,8 @@ int mdss_mdp_pp_setup_locked(struct mdss_mdp_ctl *ctl)
		if (mixer_id[i] >= mdata->nad_cfgs)
		valid_mixers = false;
		}
		if (valid_mixers && (mixer_cnt <= mdata->nmax_concurrent_ad_hw)) {
		if (valid_mixers && (mixer_cnt <= mdata->nmax_concurrent_ad_hw) &&
		(ctl->mfd->panel_info->type != DTV_PANEL)) {
		ret = mdss_mdp_ad_setup(ctl->mfd);
		if (ret < 0)
		pr_warn("ad_setup(disp%d) returns %d", disp_num, ret);