On 2025-02-20 12:26:18, Dmitry Baryshkov wrote: > In case of complex pipelines (e.g. the forthcoming quad-pipe) the DPU > might use more that one MERGE_3D block for a single output. Follow the > pattern and extend the CTL_MERGE_3D_ACTIVE active register instead of > simply writing new value there. Currently at most one MERGE_3D block is > being used, so this has no impact on existing targets. > > Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > index > 4893f10d6a5832521808c0f4d8b231c356dbdc41..321a89e6400d2824ebda2c08be5e6943cb0f6b11 > 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > @@ -548,6 +548,7 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl *ctx, > u32 dsc_active = 0; > u32 wb_active = 0; > u32 mode_sel = 0; > + u32 merge_3d_active = 0; > > /* CTL_TOP[31:28] carries group_id to collate CTL paths > * per VM. Explicitly disable it until VM support is > @@ -562,6 +563,7 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl *ctx, > intf_active = DPU_REG_READ(c, CTL_INTF_ACTIVE); > wb_active = DPU_REG_READ(c, CTL_WB_ACTIVE); > dsc_active = DPU_REG_READ(c, CTL_DSC_ACTIVE); > + merge_3d_active = DPU_REG_READ(c, CTL_MERGE_3D_ACTIVE); > > if (cfg->intf) > intf_active |= BIT(cfg->intf - INTF_0); > @@ -572,14 +574,16 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl > *ctx, > if (cfg->dsc) > dsc_active |= cfg->dsc; > > + if (cfg->merge_3d) > + merge_3d_active |= BIT(cfg->merge_3d - MERGE_3D_0); > + > DPU_REG_WRITE(c, CTL_TOP, mode_sel); > DPU_REG_WRITE(c, CTL_INTF_ACTIVE, intf_active); > DPU_REG_WRITE(c, CTL_WB_ACTIVE, wb_active); > DPU_REG_WRITE(c, CTL_DSC_ACTIVE, dsc_active); > > if (cfg->merge_3d) > - DPU_REG_WRITE(c, CTL_MERGE_3D_ACTIVE, > - BIT(cfg->merge_3d - MERGE_3D_0)); > + DPU_REG_WRITE(c, CTL_MERGE_3D_ACTIVE, merge_3d_active);
No other writes (except the new CDM, strangely) are done conditionally, since the value does not change. Let's keep it consistent with the other register writes and maybe clean this up in the future when this function gets a single view of all "connected" INTFs at once rather than doing many read-update-writes? After that: Reviewed-by: Marijn Suijten <marijn.suij...@somainline.org> > > if (cfg->cdm) > DPU_REG_WRITE(c, CTL_CDM_ACTIVE, cfg->cdm); > > -- > 2.39.5 >
