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

Commit fe9df3f5 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/dpu: add real wait_for_commit_done() 



Just waiting for next vblank isn't ideal.. we should really be looking
at the hw FLUSH register value to know if there is still an in-progress
flush without stalling unnecessarily when there is no pending flush.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarSean Paul <sean@poorly.run>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent b4bb9f15

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c

+21 −1
Original line number Diff line number Diff line
@@ -526,6 +526,26 @@ static int dpu_encoder_phys_vid_wait_for_vblank( 
	return _dpu_encoder_phys_vid_wait_for_vblank(phys_enc, true);

}



static int dpu_encoder_phys_vid_wait_for_commit_done(

		struct dpu_encoder_phys *phys_enc)

{

	struct dpu_hw_ctl *hw_ctl = phys_enc->hw_ctl;

	int ret;



	if (!hw_ctl)

		return 0;



	ret = wait_event_timeout(phys_enc->pending_kickoff_wq,

		(hw_ctl->ops.get_flush_register(hw_ctl) == 0),

		msecs_to_jiffies(50));

	if (ret <= 0) {

		DPU_ERROR("vblank timeout\n");

		return -ETIMEDOUT;

	}



	return 0;

}



static void dpu_encoder_phys_vid_prepare_for_kickoff(

		struct dpu_encoder_phys *phys_enc)

{
@@ -676,7 +696,7 @@ static void dpu_encoder_phys_vid_init_ops(struct dpu_encoder_phys_ops *ops) 
	ops->destroy = dpu_encoder_phys_vid_destroy;

	ops->get_hw_resources = dpu_encoder_phys_vid_get_hw_resources;

	ops->control_vblank_irq = dpu_encoder_phys_vid_control_vblank_irq;

	ops->wait_for_commit_done = dpu_encoder_phys_vid_wait_for_vblank;

	ops->wait_for_commit_done = dpu_encoder_phys_vid_wait_for_commit_done;

	ops->wait_for_vblank = dpu_encoder_phys_vid_wait_for_vblank;

	ops->wait_for_tx_complete = dpu_encoder_phys_vid_wait_for_vblank;

	ops->irq_control = dpu_encoder_phys_vid_irq_control;