Merge "msm:mdss: Fix the issue with AD resume" (ad98ef2a) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pp.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1754,7 +1754,7 @@ exit:
		*/
		int mdss_mdp_pp_resume(struct mdss_mdp_ctl *ctl, u32 dspp_num)
		{
		u32 flags = 0, disp_num, bl;
		u32 flags = 0, disp_num, bl, ret = 0;
		struct pp_sts_type pp_sts;
		struct mdss_ad_info *ad;
		struct mdss_data_type *mdata = ctl->mdata;
		@@ -1769,7 +1769,9 @@ int mdss_mdp_pp_resume(struct mdss_mdp_ctl *ctl, u32 dspp_num)
		disp_num = ctl->mfd->index;

		if (dspp_num < mdata->nad_cfgs) {
		ad = &mdata->ad_cfgs[dspp_num];
		ret = mdss_mdp_get_ad(ctl->mfd, &ad);
		if (ret)
		return ret;

		if (PP_AD_STATE_CFG & ad->state)
		pp_ad_cfg_write(&mdata->ad_off[dspp_num], ad);