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

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

Merge "drm/msm/sde: make LUTDMA kickoff as blocking for video mode"

parents 99372ec5 ea632eb3

drivers/gpu/drm/msm/sde/sde_encoder.c

+6 −6
Original line number Diff line number Diff line
@@ -3633,17 +3633,20 @@ static void _sde_encoder_kickoff_phys(struct sde_encoder_virt *sde_enc) 
	u32 pending_kickoff_cnt;

	struct msm_drm_private *priv = NULL;

	struct sde_kms *sde_kms = NULL;

	bool is_vid_mode = false;



	if (!sde_enc) {

		SDE_ERROR("invalid encoder\n");

		return;

	}



	is_vid_mode = sde_enc->disp_info.capabilities &

					MSM_DISPLAY_CAP_VID_MODE;



	/* don't perform flush/start operations for slave encoders */

	for (i = 0; i < sde_enc->num_phys_encs; i++) {

		struct sde_encoder_phys *phys = sde_enc->phys_encs[i];

		enum sde_rm_topology_name topology = SDE_RM_TOPOLOGY_NONE;

		bool wait_for_dma = false;



		if (!phys || phys->enable_state == SDE_ENC_DISABLED)

			continue;
@@ -3652,13 +3655,10 @@ static void _sde_encoder_kickoff_phys(struct sde_encoder_virt *sde_enc) 
		if (!ctl)

			continue;



		if (phys->ops.wait_dma_trigger)

			wait_for_dma = phys->ops.wait_dma_trigger(

					phys);



		/* make reg dma kickoff as blocking for vidoe-mode */

		if (phys->hw_ctl->ops.reg_dma_flush)

			phys->hw_ctl->ops.reg_dma_flush(phys->hw_ctl,

					wait_for_dma);

					is_vid_mode);



		if (phys->connector)

			topology = sde_connector_get_topology_name(