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

Commit bb71c092 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "disp: msm: sde: add delay after porches changed""

parents 8f16ccc9 9a26376b

msm/sde/sde_encoder_phys.h

+1 −4
Original line number Diff line number Diff line
@@ -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;

msm/sde/sde_encoder_phys_vid.c

+0 −7
Original line number Diff line number Diff line
@@ -830,8 +830,6 @@ static void sde_encoder_phys_vid_enable(struct sde_encoder_phys *phys_enc) 
	/* 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);