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

Commit cea5fe73 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: Prevent ALS data configuration when AD is disabled"

parents 6aaad42c 3668d60c

drivers/video/msm/mdss/mdss_mdp_pp.c

+2 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,8 @@ int mdss_mdp_pp_resume(struct mdss_mdp_ctl *ctl, u32 dspp_num) 
			pp_ad_cfg_write(ad);

		if (PP_AD_STATE_INIT & ad->state)

			pp_ad_init_write(ad);

		if (PP_AD_STATE_DATA & ad->state) {

		if ((PP_AD_STATE_DATA & ad->state) &&

			(ad->sts & PP_STS_ENABLE)) {

			bl = ad->bl_mfd->bl_level;

			ad->last_bl = bl;

			if (ad->state & PP_AD_STATE_BL_LIN) {