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

Commit 068f5a8d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm:msm:sde: avoid CWB connector in determining active crtc" into dev/msm-4.14-display

parents 3cdd49af b7b5c1a7

drivers/gpu/drm/msm/sde/sde_kms.c

+5 −1
Original line number Diff line number Diff line
@@ -2762,7 +2762,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);
@@ -2820,6 +2821,9 @@ static int sde_kms_pm_suspend(struct device *dev) 
		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)