Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10d70c0e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Correct AD state in driver"

parents cf256a2a 9d9c76cb

drivers/video/msm/mdss/mdss_mdp_pp.c

+5 −4
Original line number Diff line number Diff line
@@ -2168,6 +2168,7 @@ int mdss_mdp_pp_resume(struct msm_fb_data_type *mfd) 
	if ((PP_AD_STATE_DATA & ad->state) &&

			(ad->sts & PP_STS_ENABLE))

		ad->sts |= PP_AD_STS_DIRTY_DATA;

	ad->state &= ~PP_AD_STATE_VSYNC;

	mutex_unlock(&ad->lock);



	return 0;
@@ -5523,10 +5524,10 @@ static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd) 
			/* Clear state and regs when going to off state*/

			ad->sts = 0;

			ad->sts |= PP_AD_STS_DIRTY_VSYNC;

			ad->state &= !PP_AD_STATE_INIT;

			ad->state &= !PP_AD_STATE_CFG;

			ad->state &= !PP_AD_STATE_DATA;

			ad->state &= !PP_AD_STATE_BL_LIN;

			ad->state &= ~PP_AD_STATE_INIT;

			ad->state &= ~PP_AD_STATE_CFG;

			ad->state &= ~PP_AD_STATE_DATA;

			ad->state &= ~PP_AD_STATE_BL_LIN;

			ad->ad_data = 0;

			ad->ad_data_mode = 0;

			ad->last_bl = 0;