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

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

Merge "disp: msm: sde: handle another case for lost pp-done interrupt"

parents 4d435e91 a823531c

msm/sde/sde_encoder_phys_cmd.c

+15 −5
Original line number Diff line number Diff line
@@ -1345,10 +1345,11 @@ static int sde_encoder_phys_cmd_prepare_for_kickoff( 
	}

	SDE_DEBUG_CMDENC(cmd_enc, "pp %d\n", phys_enc->hw_pp->idx - PINGPONG_0);



	phys_enc->frame_trigger_mode = params->frame_trigger_mode;

	SDE_EVT32(DRMID(phys_enc->parent), phys_enc->hw_pp->idx - PINGPONG_0,

			atomic_read(&phys_enc->pending_kickoff_cnt),

			atomic_read(&cmd_enc->autorefresh.kickoff_cnt));

	phys_enc->frame_trigger_mode = params->frame_trigger_mode;

			atomic_read(&cmd_enc->autorefresh.kickoff_cnt),

			phys_enc->frame_trigger_mode);



	if (phys_enc->frame_trigger_mode == FRAME_DONE_WAIT_DEFAULT) {

		/*
@@ -1560,6 +1561,8 @@ static int sde_encoder_phys_cmd_wait_for_commit_done( 
	int rc = 0, i, pending_cnt;

	struct sde_encoder_phys_cmd *cmd_enc;

	ktime_t profile_timestamp = ktime_get();

	u32 scheduler_status = INVALID_CTL_STATUS;

	struct sde_hw_ctl *ctl;



	if (!phys_enc)

		return -EINVAL;
@@ -1585,10 +1588,16 @@ static int sde_encoder_phys_cmd_wait_for_commit_done( 
		if (cmd_enc->autorefresh.cfg.enable)

			rc = _sde_encoder_phys_cmd_wait_for_autorefresh_done(

								phys_enc);



		ctl = phys_enc->hw_ctl;

		if (ctl && ctl->ops.get_scheduler_status)

			scheduler_status = ctl->ops.get_scheduler_status(ctl);

	}



	/* wait for posted start or serialize trigger */

	if ((atomic_read(&phys_enc->pending_kickoff_cnt) > 1) ||

	pending_cnt = atomic_read(&phys_enc->pending_kickoff_cnt);

	if ((pending_cnt > 1) ||

	    (pending_cnt && (scheduler_status & BIT(0))) ||

	    (!rc && phys_enc->frame_trigger_mode == FRAME_DONE_WAIT_SERIALIZE))

		goto wait_for_idle;
@@ -1604,7 +1613,8 @@ static int sde_encoder_phys_cmd_wait_for_commit_done( 
			phys_enc->hw_pp->idx - PINGPONG_0,

			phys_enc->frame_trigger_mode,

			atomic_read(&phys_enc->pending_kickoff_cnt),

			phys_enc->enable_state, rc);

			phys_enc->enable_state,

			cmd_enc->wr_ptr_wait_success, scheduler_status, rc);

		SDE_ERROR("pp:%d failed wait_for_idle: %d\n",

				phys_enc->hw_pp->idx - PINGPONG_0, rc);

		if (phys_enc->enable_state == SDE_ENC_ERR_NEEDS_HW_RESET)