Re: [PATCH 04/16] drm/msm/dpu: add cdm blocks to sc7280 dpu_hw_catalog

[Abhinav Kumar]

On 8/30/2023 3:57 PM, Dmitry Baryshkov wrote:
> On Thu, 31 Aug 2023 at 01:49, Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx> wrote:
> > Add CDM blocks to the sc7280 dpu_hw_catalog to support
> > YUV format output from writeback block.
> >
> > Signed-off-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>
> > ---
> >   .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h  |  9 +++++++++
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h      | 13 +++++++++++++
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h         |  5 +++++
> >   3 files changed, 27 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
> > index 3b5061c4402a..5252170f216d 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
> > @@ -251,10 +251,19 @@ static const struct dpu_mdss_version sc7280_mdss_ver = {
> >          .core_minor_ver = 2,
> >   };
> >
> > +static const struct dpu_cdm_cfg sc7280_cdm = {
> > +       .name = "cdm_0",
> > +       .id = CDM_0,
> > +       .len = 0x228,
> > +       .base = 0x79200,
> > +       .features = 0,
>
> No need to.
> Also, as the CDM block seems to be common to all existing platforms,
> what about moving this definition to dpu_hw_catalog.c next to VBIF
> settings?

Thanks for the feedback and sorry for the delay in getting back to this 
feature.

Ack. Yes lets move it to dpu_hw_catalog.c and remove explicit 0 
assignment for features.

> > +};
> > +
> >   const struct dpu_mdss_cfg dpu_sc7280_cfg = {
> >          .mdss_ver = &sc7280_mdss_ver,
> >          .caps = &sc7280_dpu_caps,
> >          .mdp = &sc7280_mdp,
> > +       .cdm = &sc7280_cdm,
> >          .ctl_count = ARRAY_SIZE(sc7280_ctl),
> >          .ctl = sc7280_ctl,
> >          .sspp_count = ARRAY_SIZE(sc7280_sspp),
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> > index 6c9634209e9f..4ea7c3f85a95 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> > @@ -693,6 +693,17 @@ struct dpu_vbif_cfg {
> >          u32 memtype[MAX_XIN_COUNT];
> >   };
> >
> > +/**
> > + * struct dpu_cdm_cfg - information of chroma down blocks
> > + * @name               string name for debug purposes
> > + * @id                 enum identifying this block
> > + * @base               register offset of this block
> > + * @features           bit mask identifying sub-blocks/features
> > + */
> > +struct dpu_cdm_cfg {
> > +       DPU_HW_BLK_INFO;
> > +};
> > +
> >   /**
> >    * Define CDP use cases
> >    * @DPU_PERF_CDP_UDAGE_RT: real-time use cases
> > @@ -816,6 +827,8 @@ struct dpu_mdss_cfg {
> >          u32 wb_count;
> >          const struct dpu_wb_cfg *wb;
> >
> > +       const struct dpu_cdm_cfg *cdm;
> > +
> >          u32 ad_count;
> >
> >          u32 dspp_count;
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
> > index d85157acfbf8..4d6dba18caf0 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
> > @@ -185,6 +185,11 @@ enum dpu_dsc {
> >          DSC_MAX
> >   };
> >
> > +enum dpu_cdm {
> > +       CDM_0 = 1,
> > +       CDM_MAX
> > +};
> > +
> >   enum dpu_pingpong {
> >          PINGPONG_NONE,
> >          PINGPONG_0,
> > --
> > 2.40.1