Merge "disp: msm: sde: fix cwb crop ctrl enablement flow"

msm/sde/sde_encoder_phys_wb.c

@@ -1823,17 +1823,18 @@ static void sde_encoder_phys_wb_setup(struct sde_encoder_phys *phys_enc)
 
 	sde_encoder_phys_setup_cdm(phys_enc, fb, wb_enc->wb_fmt, wb_roi);
 
-	sde_encoder_phys_wb_setup_fb(phys_enc, fb, wb_roi, out_width, out_height);
-
-	_sde_encoder_phys_wb_setup_ctl(phys_enc, wb_enc->wb_fmt);
-
-	_sde_encoder_phys_wb_setup_sys_cache(phys_enc, fb);
 	/* clear existing intf cwb configuration before
 	 * updating for single LM PartialUpdate usecase.
 	 */
 	if (_sde_encoder_is_single_lm_partial_update(wb_enc))
 		_sde_encoder_phys_wb_setup_cwb(phys_enc, false);
 
+	sde_encoder_phys_wb_setup_fb(phys_enc, fb, wb_roi, out_width, out_height);
+
+	_sde_encoder_phys_wb_setup_ctl(phys_enc, wb_enc->wb_fmt);
+
+	_sde_encoder_phys_wb_setup_sys_cache(phys_enc, fb);
+
 	_sde_encoder_phys_wb_setup_cwb(phys_enc, true);
 
 	_sde_encoder_phys_wb_setup_prog_line(phys_enc);