| From 93c431f9979466cb5e5d3600470fb026ac8e6fac Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 17 Apr 2024 01:57:43 +0200 |
| Subject: drm/msm/dpu: Always flush the slave INTF on the CTL |
| |
| From: Marijn Suijten <marijn.suijten@somainline.org> |
| |
| [ Upstream commit 2b938c3ab0a69ec6ea587bbf6fc2aec3db4a8736 ] |
| |
| As we can clearly see in a downstream kernel [1], flushing the slave INTF |
| is skipped /only if/ the PPSPLIT topology is active. |
| |
| However, when DPU was originally submitted to mainline PPSPLIT was no |
| longer part of it (seems to have been ripped out before submission), but |
| this clause was incorrectly ported from the original SDE driver. Given |
| that there is no support for PPSPLIT (currently), flushing the slave |
| INTF should /never/ be skipped (as the `if (ppsplit && !master) goto |
| skip;` clause downstream never becomes true). |
| |
| [1]: https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers/-/blob/display-kernel.lnx.5.4.r1-rel/msm/sde/sde_encoder_phys_cmd.c?ref_type=heads#L1131-1139 |
| |
| Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support") |
| Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> |
| Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> |
| Patchwork: https://patchwork.freedesktop.org/patch/589901/ |
| Link: https://lore.kernel.org/r/20240417-drm-msm-initial-dualpipe-dsc-fixes-v1-3-78ae3ee9a697@somainline.org |
| Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 --- |
| 1 file changed, 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 2923b63d95fec..34b39a475e3e6 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 |
| @@ -479,9 +479,6 @@ static void dpu_encoder_phys_cmd_enable_helper( |
| |
| _dpu_encoder_phys_cmd_pingpong_config(phys_enc); |
| |
| - if (!dpu_encoder_phys_cmd_is_master(phys_enc)) |
| - return; |
| - |
| ctl = phys_enc->hw_ctl; |
| ctl->ops.get_bitmask_intf(ctl, &flush_mask, phys_enc->intf_idx); |
| ctl->ops.update_pending_flush(ctl, flush_mask); |
| -- |
| 2.43.0 |
| |
