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

Commit 1b847022 authored by Ray Zhang's avatar Ray Zhang Committed by Gerrit - the friendly Code Review server
Browse files

Revert "disp: msm: sde: wait for specific pp_done instead of zero" 



This reverts commit 1cb8e403.

Change-Id: I7934a30d838225e517bfd4b7256e86a2838c1bcc
Signed-off-by: default avatarRay Zhang <rayz@codeaurora.org>
parent 30f0ba58

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

+3 −6
Original line number Diff line number Diff line
@@ -444,16 +444,13 @@ static int _sde_encoder_wait_timeout(int32_t drm_id, int32_t hw_id, 


	do {

		rc = wait_event_timeout(*(info->wq),

			atomic_read(info->atomic_cnt) == info->count_check,

				wait_time_jiffies);

			atomic_read(info->atomic_cnt) == 0, wait_time_jiffies);

		cur_ktime = ktime_get();



		SDE_EVT32(drm_id, hw_id, rc, ktime_to_ms(cur_ktime),

			timeout_ms, atomic_read(info->atomic_cnt),

			info->count_check);

			timeout_ms, atomic_read(info->atomic_cnt));

	/* If we timed out, counter is valid and time is less, wait again */

	} while ((atomic_read(info->atomic_cnt) != info->count_check) &&

			(rc == 0) &&

	} while (atomic_read(info->atomic_cnt) && (rc == 0) &&

			(ktime_compare_safe(exp_ktime, cur_ktime) > 0));



	return rc;

drivers/gpu/drm/msm/sde/sde_encoder_phys.h

+0 −2
Original line number Diff line number Diff line
@@ -472,13 +472,11 @@ struct sde_enc_phys_init_params { 
 * sde_encoder_wait_info - container for passing arguments to irq wait functions

 * @wq: wait queue structure

 * @atomic_cnt: wait until atomic_cnt equals zero

 * @count_check: wait for specific atomic_cnt instead of zero.

 * @timeout_ms: timeout value in milliseconds

 */

struct sde_encoder_wait_info {

	wait_queue_head_t *wq;

	atomic_t *atomic_cnt;

	u32 count_check;

	s64 timeout_ms;

};

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

+4 −12
Original line number Diff line number Diff line
@@ -672,7 +672,6 @@ static int _sde_encoder_phys_cmd_wait_for_idle( 
	bool recovery_events;

	int ret;

	struct sde_hw_ctl *ctl;

	bool wr_ptr_wait_success = true;



	if (!phys_enc) {

		SDE_ERROR("invalid encoder\n");
@@ -680,11 +679,7 @@ static int _sde_encoder_phys_cmd_wait_for_idle( 
	}



	ctl = phys_enc->hw_ctl;



	if (sde_encoder_phys_cmd_is_master(phys_enc))

		wr_ptr_wait_success = cmd_enc->wr_ptr_wait_success;



	if (wr_ptr_wait_success &&

	if (cmd_enc->wr_ptr_wait_success &&

	  (phys_enc->frame_trigger_mode == FRAME_DONE_WAIT_POSTED_START) &&

	  ctl->ops.get_scheduler_status &&

	  (ctl->ops.get_scheduler_status(ctl) & BIT(0)) &&
@@ -697,9 +692,6 @@ static int _sde_encoder_phys_cmd_wait_for_idle( 
		return 0;

	}



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

		wait_info.count_check = 1;



	wait_info.wq = &phys_enc->pending_kickoff_wq;

	wait_info.atomic_cnt = &phys_enc->pending_kickoff_cnt;

	wait_info.timeout_ms = KICKOFF_TIMEOUT_MS;
@@ -735,7 +727,7 @@ static int _sde_encoder_phys_cmd_wait_for_autorefresh_done( 
{

	struct sde_encoder_phys_cmd *cmd_enc =

			to_sde_encoder_phys_cmd(phys_enc);

	struct sde_encoder_wait_info wait_info = {NULL};

	struct sde_encoder_wait_info wait_info;

	int ret = 0;



	if (!phys_enc) {
@@ -1359,7 +1351,7 @@ static int _sde_encoder_phys_cmd_wait_for_wr_ptr( 
{

	struct sde_encoder_phys_cmd *cmd_enc =

			to_sde_encoder_phys_cmd(phys_enc);

	struct sde_encoder_wait_info wait_info = {NULL};

	struct sde_encoder_wait_info wait_info;

	int ret;

	bool frame_pending = true;

	struct sde_hw_ctl *ctl;
@@ -1486,7 +1478,7 @@ static int sde_encoder_phys_cmd_wait_for_vblank( 
{

	int rc = 0;

	struct sde_encoder_phys_cmd *cmd_enc;

	struct sde_encoder_wait_info wait_info = {NULL};

	struct sde_encoder_wait_info wait_info;



	if (!phys_enc)

		return -EINVAL;