Skip to content
/ linux Public

Commit fb1970e

Browse files
lumagSasha Levin
authored andcommitted
drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x
[ Upstream commit 59ca3d1 ] DPU units before 4.x don't have a separate CTL_START IRQ to mark the begin of the data transfer. In such a case, wait for the frame transfer to complete rather than trying to wait for the CTL_START interrupt (and obviously hitting the timeout). Fixes: 050770c ("drm/msm/dpu: Fix timeout issues on command mode panels") Reported-by: Alexey Minnekhanov <alexeymin@postmarketos.org> Closes: https://lore.kernel.org/r/8e1d33ff-d902-4ae9-9162-e00d17a5e6d1@postmarketos.org Patchwork: https://patchwork.freedesktop.org/patch/696490/ Link: https://lore.kernel.org/r/20251228-mdp5-drop-dpu3-v4-2-7497c3d39179@oss.qualcomm.com Tested-by: Alexey Minnekhanov <alexeymin@minlexx.ru> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 987dee1 commit fb1970e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -685,10 +685,11 @@ static int dpu_encoder_phys_cmd_wait_for_commit_done(
685685
if (!dpu_encoder_phys_cmd_is_master(phys_enc))
686686
return 0;
687687

688-
if (phys_enc->hw_ctl->ops.is_started(phys_enc->hw_ctl))
689-
return dpu_encoder_phys_cmd_wait_for_tx_complete(phys_enc);
688+
if (phys_enc->irq[INTR_IDX_CTL_START] &&
689+
!phys_enc->hw_ctl->ops.is_started(phys_enc->hw_ctl))
690+
return _dpu_encoder_phys_cmd_wait_for_ctl_start(phys_enc);
690691

691-
return _dpu_encoder_phys_cmd_wait_for_ctl_start(phys_enc);
692+
return dpu_encoder_phys_cmd_wait_for_tx_complete(phys_enc);
692693
}
693694

694695
static int dpu_encoder_phys_cmd_wait_for_vblank(

0 commit comments

Comments
 (0)