Răsfoiți Sursa

Merge "disp: msm: sde: avoid reset topology in disable path for POMS"

qctecmdr 4 ani în urmă
părinte
comite
ff27df4031
1 a modificat fișierele cu 2 adăugiri și 1 ștergeri
  1. 2 1
      msm/sde/sde_encoder.c

+ 2 - 1
msm/sde/sde_encoder.c

@@ -3100,7 +3100,8 @@ static void sde_encoder_virt_disable(struct drm_encoder *drm_enc)
 	sde_encoder_resource_control(drm_enc, SDE_ENC_RC_EVENT_STOP);
 	sde_encoder_resource_control(drm_enc, SDE_ENC_RC_EVENT_STOP);
 
 
 	/* reset connector topology name property */
 	/* reset connector topology name property */
-	if (sde_enc->cur_master && sde_enc->cur_master->connector) {
+	if (sde_enc->cur_master && sde_enc->cur_master->connector &&
+			sde_enc->crtc->state->active_changed) {
 		ret = sde_rm_update_topology(&sde_kms->rm,
 		ret = sde_rm_update_topology(&sde_kms->rm,
 				sde_enc->cur_master->connector->state, NULL);
 				sde_enc->cur_master->connector->state, NULL);
 		if (ret) {
 		if (ret) {