On 2025-05-06 15:53:48, Dmitry Baryshkov wrote: > From: Dmitry Baryshkov <lu...@kernel.org> > > Follow the changes in the commit a2649952f66e ("drm/msm/dpu: remove > DPU_CTL_SPLIT_DISPLAY from CTL blocks on DPU >= 5.0") and remove > DPU_CTL_SPLIT_DISPLAY from the CTL blocks on the SAR2130P platform. > Single CTL is used for all interfaces used by a single path > > Fixes: 178575173472 ("drm/msm/dpu: add catalog entry for SAR2130P")
This was probably more of a "developed and merged in parallel" problem than a faulty patch, because a2649952f66e was merged first. Regardless: Reviewed-by: Marijn Suijten <marijn.suij...@somainline.org> > Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@oss.qualcomm.com> > --- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h > b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h > index > 22dd16c6e210e9520ecb7a851bee402032fa1ee2..5667d055fbd1d8125c3231302daa3e05de5944c9 > 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h > @@ -27,17 +27,16 @@ static const struct dpu_mdp_cfg sar2130p_mdp = { > }, > }; > > -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL > support */ > static const struct dpu_ctl_cfg sar2130p_ctl[] = { > { > .name = "ctl_0", .id = CTL_0, > .base = 0x15000, .len = 0x290, > - .features = CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), > + .features = CTL_SM8550_MASK, > .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), > }, { > .name = "ctl_1", .id = CTL_1, > .base = 0x16000, .len = 0x290, > - .features = CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), > + .features = CTL_SM8550_MASK, > .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), > }, { > .name = "ctl_2", .id = CTL_2, > > --- > base-commit: 0a00723f4c2d0b273edd0737f236f103164a08eb > change-id: 20250506-dpu-sar2130p-no-split-display-442eb0b85165 > > Best regards, > -- > Dmitry Baryshkov <dmitry.barysh...@oss.qualcomm.com> >