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

Commit 4e547701 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: sde: avoid CWB connector in determining active crtc"

parents 8e8e40b6 08b43d57

msm/sde/sde_encoder_phys_wb.c

+2 −0
Original line number Diff line number Diff line
@@ -1616,6 +1616,8 @@ static void sde_encoder_phys_wb_disable(struct sde_encoder_phys *phys_enc) 


	phys_enc->enable_state = SDE_ENC_DISABLED;

	wb_enc->crtc = NULL;

	phys_enc->hw_cdm = NULL;

	phys_enc->hw_ctl = NULL;

}



/**

msm/sde/sde_kms.c

+5 −1
Original line number Diff line number Diff line
@@ -2755,6 +2755,9 @@ static void _sde_kms_pm_suspend_idle_helper(struct sde_kms *sde_kms, 
		if (lp != SDE_MODE_DPMS_LP2)

			continue;



		if (sde_encoder_in_clone_mode(conn->encoder))

			continue;



		ret = sde_encoder_wait_for_event(conn->encoder,

						MSM_ENC_TX_COMPLETE);

		if (ret && ret != -EWOULDBLOCK)
@@ -2841,7 +2844,8 @@ static int sde_kms_pm_suspend(struct device *dev) 
		uint64_t lp;



		if (!conn->state || !conn->state->crtc ||

				conn->dpms != DRM_MODE_DPMS_ON)

			conn->dpms != DRM_MODE_DPMS_ON ||

			sde_encoder_in_clone_mode(conn->encoder))

			continue;



		lp = sde_connector_get_lp(conn);