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

Commit 01466c60 authored by Zhao, Yuan's avatar Zhao, Yuan Committed by Abhijit Kulkarni
Browse files

Revert "disp: msm: sde: trigger esd recovery before event notification" 



This reverts commit 9ce6a2fb.
Revert the change for sde_encoder.c, and keep the change for
sde_connector.c.

Change-Id: I19ff26e4543b9b338ccaf363c99c5eb2c115f99b
Signed-off-by: default avatarZhao, Yuan <yzhao@codeaurora.org>
Signed-off-by: default avatarAbhijit Kulkarni <kabhijit@codeaurora.org>
parent 90c3cec4

msm/sde/sde_encoder.c

+2 −2
Original line number Diff line number Diff line
@@ -2695,7 +2695,8 @@ static void sde_encoder_virt_enable(struct drm_encoder *drm_enc) 
			!(msm_is_mode_seamless_vrr(cur_mode)

			|| msm_is_mode_seamless_dms(cur_mode)

			|| msm_is_mode_seamless_dyn_clk(cur_mode)))

		kthread_cancel_delayed_work_sync(&sde_enc->delayed_off_work);

		kthread_init_delayed_work(&sde_enc->delayed_off_work,

			sde_encoder_off_work);



	ret = sde_encoder_resource_control(drm_enc, SDE_ENC_RC_EVENT_KICKOFF);

	if (ret) {
@@ -2855,7 +2856,6 @@ static void sde_encoder_virt_disable(struct drm_encoder *drm_enc) 
	 */

	sde_enc->crtc = NULL;

	memset(&sde_enc->mode_info, 0, sizeof(sde_enc->mode_info));

	kthread_cancel_delayed_work_sync(&sde_enc->delayed_off_work);



	SDE_DEBUG_ENC(sde_enc, "encoder disabled\n");