Re: [PATCH v4 3/4] drm/msm/dpu: rename enable_compression() to program_intf_cmd_cfg()

[Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>]

On 7/11/2023 5:42 PM, Dmitry Baryshkov wrote:
> On 12/07/2023 03:33, Abhinav Kumar wrote:
> > Rename the intf's enable_compression() op to program_intf_cmd_cfg()
> > and allow it to accept a struct intf_cmd_mode_cfg to program
> > all the bits at once. This can be re-used by widebus later on as
> > well as it touches the same register.
> >
> > Signed-off-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>
> > ---
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c |  8 ++++++--
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c          |  8 +++++---
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h          | 11 +++++++++--
> >   3 files changed, 20 insertions(+), 7 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 b856c6286c85..052824eac9f3 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
> > @@ -50,6 +50,7 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg(
> >               to_dpu_encoder_phys_cmd(phys_enc);
> >       struct dpu_hw_ctl *ctl;
> >       struct dpu_hw_intf_cfg intf_cfg = { 0 };
> > +    struct intf_cmd_mode_cfg cmd_mode_cfg = {};
> >       ctl = phys_enc->hw_ctl;
> >       if (!ctl->ops.setup_intf_cfg)
> > @@ -68,8 +69,11 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg(
> >                   phys_enc->hw_intf,
> >                   phys_enc->hw_pp->idx);
> > -    if (intf_cfg.dsc != 0 && phys_enc->hw_intf->ops.enable_compression)
> > -        phys_enc->hw_intf->ops.enable_compression(phys_enc->hw_intf);
> > +    if (intf_cfg.dsc != 0)
> > +        cmd_mode_cfg.data_compress = true;
> > +
> > +    if (phys_enc->hw_intf->ops.program_intf_cmd_cfg)
> > +        
> > phys_enc->hw_intf->ops.program_intf_cmd_cfg(phys_enc->hw_intf, 
> > &cmd_mode_cfg);
> >   }
> >   static void dpu_encoder_phys_cmd_pp_tx_done_irq(void *arg, int irq_idx)
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c 
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
> > index d766791438e7..7323c713dad1 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
> > @@ -513,11 +513,13 @@ static void 
> > dpu_hw_intf_disable_autorefresh(struct dpu_hw_intf *intf,
> >   }
> > -static void dpu_hw_intf_enable_compression(struct dpu_hw_intf *ctx)
> > +static void dpu_hw_intf_program_intf_cmd_cfg(struct dpu_hw_intf *ctx,
> > +                         struct intf_cmd_mode_cfg *cmd_mode_cfg)
> >   {
> >       u32 intf_cfg2 = DPU_REG_READ(&ctx->hw, INTF_CONFIG2);
> > -    intf_cfg2 |= INTF_CFG2_DCE_DATA_COMPRESS;
> > +    if (cmd_mode_cfg->data_compress)
> > +        intf_cfg2 |= INTF_CFG2_DCE_DATA_COMPRESS;
> >       DPU_REG_WRITE(&ctx->hw, INTF_CONFIG2, intf_cfg2);
> >   }
> > @@ -544,7 +546,7 @@ static void _setup_intf_ops(struct dpu_hw_intf_ops 
> > *ops,
> >       }
> >       if (mdss_rev->core_major_ver >= 7)
> > -        ops->enable_compression = dpu_hw_intf_enable_compression;
> > +        ops->program_intf_cmd_cfg = dpu_hw_intf_program_intf_cmd_cfg;
> >   }
> >   struct dpu_hw_intf *dpu_hw_intf_init(const struct dpu_intf_cfg *cfg,
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h 
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h
> > index 3b5f18dbcb4b..c15f4973de5e 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h
> > @@ -48,6 +48,11 @@ struct intf_status {
> >       u32 line_count;        /* current line count including blanking */
> >   };
> > +struct intf_cmd_mode_cfg {
>
> My first reaction was that usually all DPU structure names start with 
> dpu_. Then I discovered that dpu_hw_intf.h diverges from this useful 
> custom. Could you please: fix existing structure struct intf_* names to 
> bear the dpu_ prefix. Then this structure can also be named as struct 
> dpu_intf_cmd_mode_cfg.

Yeah I thought so too .... Ok, I can clean that up in this series and 
rename this.

Ack on the below comments.

> > +    u8 data_compress;    /* enable data compress between dpu and dsi */
> > +    /* can be expanded for other programmable bits */
>
> Please drop this comment.
>
> > +};
> > +
> >   /**
> >    * struct dpu_hw_intf_ops : Interface to the interface Hw driver 
> > functions
> >    *  Assumption is these functions will be called after clocks are 
> > enabled
> > @@ -70,7 +75,7 @@ struct intf_status {
> >    * @get_autorefresh:            Retrieve autorefresh config from 
> > hardware
> >    *                              Return: 0 on success, -ETIMEDOUT on 
> > timeout
> >    * @vsync_sel:                  Select vsync signal for tear-effect 
> > configuration
> > - * @enable_compression:         Enable data compression
> > + * @program_intf_cmd_cfg:       Program the DPU to interface datapath 
> > for command mode
> >    */
> >   struct dpu_hw_intf_ops {
> >       void (*setup_timing_gen)(struct dpu_hw_intf *intf,
> > @@ -108,7 +113,9 @@ struct dpu_hw_intf_ops {
> >        */
> >       void (*disable_autorefresh)(struct dpu_hw_intf *intf, uint32_t 
> > encoder_id, u16 vdisplay);
> > -    void (*enable_compression)(struct dpu_hw_intf *intf);
> > +    // Program the datapath between DPU and intf for command mode
>
> We have been using c99 comments in the code, Moreover, there is already 
> description for this field in the comment above, so it can be dropped too.
>
> > +    void (*program_intf_cmd_cfg)(struct dpu_hw_intf *intf,
> > +                     struct intf_cmd_mode_cfg *cmd_mode_cfg);
> >   };
> >   struct dpu_hw_intf {