disp: msm: sde: update ds atomic check for pu and cwb

This change fixes the destination scaler atomic check
to support PU with CWB disable without an additional
frame in between. It also fixes the destination height
calculation.

Change-Id: I93ae8471d2db0b4e2574d18a873d4d4e180cbcbb
Signed-off-by: Lakshmi Narayana Kalavala <[email protected]>

msm/sde/sde_encoder.c

@@ -923,7 +923,7 @@ static int _sde_encoder_atomic_check_pu_roi(struct sde_encoder_virt *sde_enc,
 {
 	int ret = 0;
 
-	if (drm_atomic_crtc_needs_modeset(crtc_state)) {
+	if (crtc_state->mode_changed || crtc_state->active_changed) {
 		struct sde_rect mode_roi, roi;
 
 		mode_roi.x = 0;

msm/sde/sde_encoder_phys_wb.c

@@ -670,7 +670,7 @@ static int _sde_enc_phys_wb_validate_cwb(struct sde_encoder_phys *phys_enc,
 		if (cstate->ds_cfg[i].scl3_cfg.enable) {
 			ds_in_use = true;
 			ds_outw += cstate->ds_cfg[i].scl3_cfg.dst_width;
-			ds_outh += cstate->ds_cfg[i].scl3_cfg.dst_height;
+			ds_outh = cstate->ds_cfg[i].scl3_cfg.dst_height;
 		}
 
 	/* if ds in use check wb roi against ds output dimensions */