disp: msm: sde: delay cwb done wait for last frame

Commit Ifa100424733 ("disp: msm: sde: delay
encoder disable for clone mode") delays the CWB
encoder disable but it is also skipping the CWB
disable flush. That can cause the underrun on dp
display if it uses the same 3d_merge HW block. This
change reverts the portion of original code and
only delays the last cwb frame done wait. It still
keep the last CWB frame done wait as it is if crtc
is also moving to inactive state.

Change-Id: I3461188a35197f2925899ceea7ef705adf00a398
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>

msm/msm_atomic.c

@@ -142,50 +142,16 @@ static void msm_atomic_wait_for_commit_done(
 	}
 }
 
-static bool
-msm_disable_outputs_for_clone_conn(struct drm_device *dev,
-		struct drm_atomic_state *old_state)
-{
-	struct drm_connector *connector;
-	struct drm_connector_state *old_conn_state;
-	struct drm_crtc_state *old_crtc_state;
-	struct drm_crtc *crtc = NULL;
-	int i;
-	bool clone_state = false;
-
-	for_each_old_connector_in_state(old_state, connector,
-			old_conn_state, i) {
-
-		if (!old_conn_state->crtc)
-			continue;
-
-		old_crtc_state = drm_atomic_get_old_crtc_state(old_state,
-							old_conn_state->crtc);
-		if (!old_crtc_state->active ||
-		    !old_conn_state->crtc->state->connectors_changed ||
-		    (!_msm_seamless_for_conn(connector, old_conn_state,
-				 false) && (connector->connector_type !=
-						DRM_MODE_CONNECTOR_VIRTUAL)))
-			return false;
-
-		if (crtc)
-			clone_state = (crtc == old_conn_state->crtc)
-				? true : false;
-
-		crtc = old_conn_state->crtc;
-	}
-
-	return clone_state;
-}
-
 static void
-msm_disable_connector_outputs(struct drm_device *dev,
-		struct drm_atomic_state *old_state)
+msm_disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
 {
 	struct drm_connector *connector;
 	struct drm_connector_state *old_conn_state;
+	struct drm_crtc *crtc;
+	struct drm_crtc_state *old_crtc_state;
 	int i;
 
+	SDE_ATRACE_BEGIN("msm_disable");
 	for_each_old_connector_in_state(old_state, connector,
 			old_conn_state, i) {
 		const struct drm_encoder_helper_funcs *funcs;
@@ -238,18 +204,6 @@ msm_disable_connector_outputs(struct drm_device *dev,
 
 		drm_bridge_post_disable(encoder->bridge);
 	}
-}
-
-static void
-msm_disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
-{
-	struct drm_crtc *crtc;
-	struct drm_crtc_state *old_crtc_state;
-	int i;
-
-	SDE_ATRACE_BEGIN("msm_disable");
-	if (!msm_disable_outputs_for_clone_conn(dev, old_state))
-		msm_disable_connector_outputs(dev, old_state);
 
 	for_each_old_crtc_in_state(old_state, crtc, old_crtc_state, i) {
 		const struct drm_crtc_helper_funcs *funcs;
@@ -568,9 +522,6 @@ static void complete_commit(struct msm_commit *c)
 
 	kms->funcs->complete_commit(kms, state);
 
-	if (msm_disable_outputs_for_clone_conn(dev, state))
-		msm_disable_connector_outputs(dev, state);
-
 	drm_atomic_state_put(state);
 
 	commit_destroy(c);