From 01466c6032c31c13a44495dd6a8adcd0d3452c9b Mon Sep 17 00:00:00 2001 From: "Zhao, Yuan" Date: Wed, 30 Sep 2020 14:08:10 +0800 Subject: [PATCH] Revert "disp: msm: sde: trigger esd recovery before event notification" This reverts commit 9ce6a2fbb3b7d41892800711a2c1432fbfa1a35f. Revert the change for sde_encoder.c, and keep the change for sde_connector.c. Change-Id: I19ff26e4543b9b338ccaf363c99c5eb2c115f99b Signed-off-by: Zhao, Yuan Signed-off-by: Abhijit Kulkarni --- msm/sde/sde_encoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msm/sde/sde_encoder.c b/msm/sde/sde_encoder.c index c4807b54da..ccf0fdeb41 100644 --- a/msm/sde/sde_encoder.c +++ b/msm/sde/sde_encoder.c @@ -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");