From b49188b45a516f008dd2c2abd52aec63e28d56b3 Mon Sep 17 00:00:00 2001 From: Dhaval Patel Date: Wed, 22 Jul 2020 22:30:25 -0700 Subject: [PATCH] disp: msm: sde: avoid extra vblank refcount from modeset SDE encoder modeset add and remove the vblank refcount based on userspace vblank refcount request. This logic can have race condition with vblank update from crtc event thread. It is already avoided with Ibb810ec90e8 ("disp: msm: sde: manage vblank refcount concurrency"). Change-Id: I1749bff2e2574500db03a405781eab7496f307b2 Signed-off-by: Dhaval Patel --- msm/sde/sde_encoder.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/msm/sde/sde_encoder.c b/msm/sde/sde_encoder.c index dff9c12d4a..37a8dad277 100644 --- a/msm/sde/sde_encoder.c +++ b/msm/sde/sde_encoder.c @@ -1782,7 +1782,6 @@ static int _sde_encoder_rc_pre_modeset(struct drm_encoder *drm_enc, } sde_encoder_irq_control(drm_enc, false); - _sde_encoder_modeset_helper_locked(drm_enc, sw_event); SDE_EVT32(DRMID(drm_enc), sw_event, sde_enc->rc_state, SDE_ENC_RC_STATE_MODESET, SDE_EVTLOG_FUNC_CASE5); @@ -1818,7 +1817,6 @@ static int _sde_encoder_rc_post_modeset(struct drm_encoder *drm_enc, goto end; } - _sde_encoder_modeset_helper_locked(drm_enc, sw_event); sde_encoder_irq_control(drm_enc, true); _sde_encoder_update_rsc_client(drm_enc, true);