[PATCH v3 06/18] drm/msm/dpu: rename dpu_hw_pipe_cdp_cfg to dpu_hw_cdp_cfg

[Dmitry Baryshkov]

On Thu, 21 Apr 2022 at 02:50, Abhinav Kumar <quic_abhinavk at quicinc.com> wrote:
>
> Rename dpu_hw_pipe_cdp_cfg to dpu_hw_cdp_cfg and move it
> to dpu_hw_utils file so that other modules in addition to
> SSPP such as writeback can use it as all the fields can
> be used by writeback as well.
>
> Suggested-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> Signed-off-by: Abhinav Kumar <quic_abhinavk at quicinc.com>

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>

> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c |  2 +-
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 18 +-----------------
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 15 +++++++++++++++
>  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c   |  4 ++--
>  4 files changed, 19 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> index 09cdc35..0a0864d 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> @@ -627,7 +627,7 @@ static void dpu_hw_sspp_setup_qos_ctrl(struct dpu_hw_pipe *ctx,
>  }
>
>  static void dpu_hw_sspp_setup_cdp(struct dpu_hw_pipe *ctx,
> -               struct dpu_hw_pipe_cdp_cfg *cfg,
> +               struct dpu_hw_cdp_cfg *cfg,
>                 enum dpu_sspp_multirect_index index)
>  {
>         u32 idx;
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
> index 92b071b..a81e166 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
> @@ -193,22 +193,6 @@ enum {
>  };
>
>  /**
> - * struct dpu_hw_pipe_cdp_cfg : CDP configuration
> - * @enable: true to enable CDP
> - * @ubwc_meta_enable: true to enable ubwc metadata preload
> - * @tile_amortize_enable: true to enable amortization control for tile format
> - * @preload_ahead: number of request to preload ahead
> - *     DPU_SSPP_CDP_PRELOAD_AHEAD_32,
> - *     DPU_SSPP_CDP_PRELOAD_AHEAD_64
> - */
> -struct dpu_hw_pipe_cdp_cfg {
> -       bool enable;
> -       bool ubwc_meta_enable;
> -       bool tile_amortize_enable;
> -       u32 preload_ahead;
> -};
> -
> -/**
>   * struct dpu_hw_pipe_ts_cfg - traffic shaper configuration
>   * @size: size to prefill in bytes, or zero to disable
>   * @time: time to prefill in usec, or zero to disable
> @@ -359,7 +343,7 @@ struct dpu_hw_sspp_ops {
>          * @index: rectangle index in multirect
>          */
>         void (*setup_cdp)(struct dpu_hw_pipe *ctx,
> -                       struct dpu_hw_pipe_cdp_cfg *cfg,
> +                       struct dpu_hw_cdp_cfg *cfg,
>                         enum dpu_sspp_multirect_index index);
>  };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
> index 3913475..a200df1 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
> @@ -298,6 +298,21 @@ struct dpu_drm_scaler_v2 {
>         struct dpu_drm_de_v1 de;
>  };
>
> +/**
> + * struct dpu_hw_cdp_cfg : CDP configuration
> + * @enable: true to enable CDP
> + * @ubwc_meta_enable: true to enable ubwc metadata preload
> + * @tile_amortize_enable: true to enable amortization control for tile format
> + * @preload_ahead: number of request to preload ahead
> + *     DPU_*_CDP_PRELOAD_AHEAD_32,
> + *     DPU_*_CDP_PRELOAD_AHEAD_64
> + */
> +struct dpu_hw_cdp_cfg {
> +       bool enable;
> +       bool ubwc_meta_enable;
> +       bool tile_amortize_enable;
> +       u32 preload_ahead;
> +};
>
>  u32 *dpu_hw_util_get_log_mask_ptr(void);
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index c77c3d9d..08b8c64 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -1246,9 +1246,9 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane)
>                                 pstate->multirect_index);
>
>                 if (pdpu->pipe_hw->ops.setup_cdp) {
> -                       struct dpu_hw_pipe_cdp_cfg cdp_cfg;
> +                       struct dpu_hw_cdp_cfg cdp_cfg;
>
> -                       memset(&cdp_cfg, 0, sizeof(struct dpu_hw_pipe_cdp_cfg));
> +                       memset(&cdp_cfg, 0, sizeof(struct dpu_hw_cdp_cfg));
>
>                         cdp_cfg.enable = pdpu->catalog->perf.cdp_cfg
>                                         [DPU_PERF_CDP_USAGE_RT].rd_enable;
> --
> 2.7.4
>


-- 
With best wishes
Dmitry