Merge "msm: mdss: Allow CMD panels for Assertive Display" (1787641f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -1046,8 +1046,7 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer)
		flags = 0;

		mixer_cnt = mdss_mdp_get_ctl_mixers(disp_num, mixer_id);
		if (dspp_num < mdata->nad_cfgs && (mixer_cnt != 2) &&
		ctl->mfd->panel_info->type != MIPI_CMD_PANEL) {
		if (dspp_num < mdata->nad_cfgs && (mixer_cnt != 2)) {
		ret = mdss_mdp_ad_setup(ctl->mfd);
		if (ret < 0)
		pr_warn("ad_setup(dspp%d) returns %d", dspp_num, ret);
		@@ -2854,11 +2853,6 @@ static int mdss_ad_init_checks(struct msm_fb_data_type *mfd)
		return -ENODEV;
		}

		if (ad_mfd->panel_info->type == MIPI_CMD_PANEL) {
		pr_debug("Command panel not supported");
		return -EINVAL;
		}

		mixer_num = mdss_mdp_get_ctl_mixers(ad_mfd->index, mixer_id);
		if (!mixer_num) {
		pr_debug("no mixers connected, %d", mixer_num);