drm/msm/dpu: add missing flush and fetch bits for DMA4/DMA5 planes
PATCH 1/1 drm/msm/dpu: add missing flush and fetch bits for DMA4/DMA5 planes
Note that with this, DMA4/DMA5 are still non-functional, but at least display *something* in modetest instead of nothing or underflow.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +7 -1
@@ -51,7 +51,7 @@static const u32 fetch_tbl[SSPP_MAX ] = {CTL_INVALID_BIT ,16 ,17 ,18 ,19 ,CTL_INVALID_BIT ,CTL_INVALID_BIT ,CTL_INVALID_BIT ,CTL_INVALID_BIT ,0 , -1 ,2 ,3 ,CTL_INVALID_BIT ,CTL_INVALID_BIT }; +1 ,2 ,3 ,4 ,5 }; static const struct dpu_ctl_cfg *_ctl_offset(enum dpu_ctl ctl, const struct dpu_mdss_cfg *m,
@@ -206,6 +206,12 @@ static void dpu_hw_ctl_update_pending_flush_sspp(struct dpu_hw_ctl *ctx,case SSPP_DMA3 : ctx->pending_flush_mask |=BIT (25 );break ; +case SSPP_DMA4 : + ctx->pending_flush_mask |=BIT (13 ); +break ; +case SSPP_DMA5 : + ctx->pending_flush_mask |=BIT (14 ); +break ;case SSPP_CURSOR0 : ctx->pending_flush_mask |=BIT (22 );break ;
Signature · 1 line
2.26.1
Quoted 6 lines · Jonathan Marek
Note that with this, DMA4/DMA5 are still non-functional, but at least display *something* in modetest instead of nothing or underflow.
Fixes efcd0107727c ("drm/msm/dpu: add support for SM8550")Signed-off-by Jonathan Marek <[email protected]>---
Will pick this up for -fixes
Quoted 25 lines · Jonathan Marek
Note that with this, DMA4/DMA5 are still non-functional, but at least display *something* in modetest instead of nothing or underflow.
Fixes efcd0107727c ("drm/msm/dpu: add support for SM8550")Signed-off-by Jonathan Marek <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +1
-1@@ -51,7 +51,7 @@static const u32 fetch_tbl[SSPP_MAX ] = {CTL_INVALID_BIT ,16 ,17 ,18 ,19 ,CTL_INVALID_BIT ,CTL_INVALID_BIT ,CTL_INVALID_BIT ,CTL_INVALID_BIT ,0 , -1 ,2 ,3 ,CTL_INVALID_BIT ,CTL_INVALID_BIT }; +1 ,2 ,3 ,4 ,5 }; static const struct dpu_ctl_cfg *_ctl_offset(enum dpu_ctl ctl, const struct dpu_mdss_cfg *m,@@ -206,6 +206,12 @@ static void dpu_hw_ctl_update_pending_flush_sspp(struct dpu_hw_ctl *ctx,case SSPP_DMA3 : ctx->pending_flush_mask |=BIT (25 );
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c static void dpu_hw_ctl_update_pending_flush_sspp(struct dpu_hw_ctl *ctx, · line 217
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +6
-0break ; +case SSPP_DMA4 : + ctx->pending_flush_mask |=BIT (13 ); +break ; +case SSPP_DMA5 : + ctx->pending_flush_mask |=BIT (14 ); +break ;case SSPP_CURSOR0 : ctx->pending_flush_mask |=BIT (22 );break ;
It permits displaying something, but the output is still corrupted on both DMA4 & DMA5, tested with multiple plane sizes and formats.
modetest -P 81@93:1080x2400
and
modetest -P 87@93:1080x2400
Photo of actual display:
https://people.linaro.org/~neil.armstrong/sm8550-dma5.jpg
Works fine with DMA2 & DMA3 planes with same parameters.
Tested with https://patchwork.freedesktop.org/patch/538277/?series=118074&rev=1, and it doesn't change anything.
I think this is still accurate:
Thanks,
Neil
Abhinav Kumar
AppliedQuoted 4 lines · Jonathan Marek
Note that with this, DMA4/DMA5 are still non-functional, but at least display *something* in modetest instead of nothing or underflow.
Applied, thanks!
[1/1] drm/msm/dpu: add missing flush and fetch bits for DMA4/DMA5 planes
https://gitlab.freedesktop.org/drm/msm/-/commit/ba7a94ea7312
Best regards,
Signature · 1 line
Abhinav Kumar <[email protected]>