| From f13168f890bd9262dcef2bced3de84053cbc5ade Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 28 Dec 2025 06:02:28 +0200 |
| Subject: drm/msm/dpu: fix CMD panels on DPU 1.x - 3.x |
| |
| From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> |
| |
| [ Upstream commit 59ca3d11f5311d9167015fe4f431701614ae0048 ] |
| |
| 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: 050770cbbd26 ("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> |
| --- |
| drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c |
| index e05c3ccf07f8e..7581e418418f1 100644 |
| --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c |
| +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c |
| @@ -685,10 +685,11 @@ static int dpu_encoder_phys_cmd_wait_for_commit_done( |
| if (!dpu_encoder_phys_cmd_is_master(phys_enc)) |
| return 0; |
| |
| - if (phys_enc->hw_ctl->ops.is_started(phys_enc->hw_ctl)) |
| - return dpu_encoder_phys_cmd_wait_for_tx_complete(phys_enc); |
| + if (phys_enc->irq[INTR_IDX_CTL_START] && |
| + !phys_enc->hw_ctl->ops.is_started(phys_enc->hw_ctl)) |
| + return _dpu_encoder_phys_cmd_wait_for_ctl_start(phys_enc); |
| |
| - return _dpu_encoder_phys_cmd_wait_for_ctl_start(phys_enc); |
| + return dpu_encoder_phys_cmd_wait_for_tx_complete(phys_enc); |
| } |
| |
| static int dpu_encoder_phys_cmd_wait_for_vblank( |
| -- |
| 2.51.0 |
| |
