From 9a26376b144bf721f67ad6281148ec8c195de739 Mon Sep 17 00:00:00 2001 From: Narendra Muppalla Date: Thu, 10 Sep 2020 17:43:01 -0700 Subject: [PATCH] Revert "disp: msm: sde: add delay after porches changed" This reverts commit 15ae91e80617f06de7f69cbe7c685a49fea62d1d. Change-Id: I11c795a8d16440a42e36e3a5bef27a6a78eec5fc Signed-off-by: Narendra Muppalla --- msm/sde/sde_encoder_phys.h | 5 +---- msm/sde/sde_encoder_phys_vid.c | 7 ------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/msm/sde/sde_encoder_phys.h b/msm/sde/sde_encoder_phys.h index 2dafc246..f653bbe7 100644 --- a/msm/sde/sde_encoder_phys.h +++ b/msm/sde/sde_encoder_phys.h @@ -52,16 +52,13 @@ enum sde_enc_split_role { * @SDE_ENC_ENABLED: Encoder is enabled * @SDE_ENC_ERR_NEEDS_HW_RESET: Encoder is enabled, but requires a hw_reset * to recover from a previous error - * @SDE_ENC_TIMING_ENGINE_RECONFIG: Encoder is enabled and timing engine - * parameters are updated */ enum sde_enc_enable_state { SDE_ENC_DISABLING, SDE_ENC_DISABLED, SDE_ENC_ENABLING, SDE_ENC_ENABLED, - SDE_ENC_ERR_NEEDS_HW_RESET, - SDE_ENC_TIMING_ENGINE_RECONFIG, + SDE_ENC_ERR_NEEDS_HW_RESET }; struct sde_encoder_phys; diff --git a/msm/sde/sde_encoder_phys_vid.c b/msm/sde/sde_encoder_phys_vid.c index 24739592..03dae317 100644 --- a/msm/sde/sde_encoder_phys_vid.c +++ b/msm/sde/sde_encoder_phys_vid.c @@ -830,8 +830,6 @@ skip_flush: /* ctl_flush & timing engine enable will be triggered by framework */ if (phys_enc->enable_state == SDE_ENC_DISABLED) phys_enc->enable_state = SDE_ENC_ENABLING; - if (phys_enc->enable_state == SDE_ENC_ENABLED) - phys_enc->enable_state = SDE_ENC_TIMING_ENGINE_RECONFIG; } static void sde_encoder_phys_vid_destroy(struct sde_encoder_phys *phys_enc) @@ -1122,11 +1120,6 @@ static void sde_encoder_phys_vid_handle_post_kickoff( lock_flags); } phys_enc->enable_state = SDE_ENC_ENABLED; - } else if (phys_enc->enable_state == SDE_ENC_TIMING_ENGINE_RECONFIG) { - /* add 2 vsync delay for timing engine change */ - sde_encoder_phys_vid_single_vblank_wait(phys_enc); - sde_encoder_phys_vid_single_vblank_wait(phys_enc); - phys_enc->enable_state = SDE_ENC_ENABLED; } avr_mode = sde_connector_get_qsync_mode(phys_enc->connector);