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

Commit f6cfe46a authored by Steve Cohen's avatar Steve Cohen
Browse files

Revert "disp: msm: sde: fix race between disable commit and vblank work" 



This is a partial revert of commit:
	31dd25c6.

The enc->crtc link cannot be relied upon outside of the display
thread context since the DRM legacy modeset API will detach and
re-attach this connection on every commit.

The logic to flush the event thread in all cases during the CRTC
disable is kept from the original patch.

Change-Id: I2cd4ae47589bb397c72de0e9deba9b0c710d379a
Signed-off-by: default avatarSteve Cohen <cohens@codeaurora.org>
parent ecc89334

msm/sde/sde_crtc.c

+4 −8
Original line number Diff line number Diff line
@@ -3850,10 +3850,8 @@ static int _sde_crtc_vblank_enable_no_lock( 
		if (ret < 0)

			return ret;



		drm_for_each_encoder(enc, crtc->dev) {

			if (enc->crtc != crtc)

				continue;



		drm_for_each_encoder_mask(enc, crtc->dev,

				crtc->state->encoder_mask) {

			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,

					sde_crtc->enabled);
@@ -3861,10 +3859,8 @@ static int _sde_crtc_vblank_enable_no_lock( 
					sde_crtc_vblank_cb, (void *)crtc);

		}

	} else {

		drm_for_each_encoder(enc, crtc->dev) {

			if (enc->crtc != crtc)

				continue;



		drm_for_each_encoder_mask(enc, crtc->dev,

				crtc->state->encoder_mask) {

			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,

					sde_crtc->enabled);