[Freedreno] [PATCH v2 3/7] drm/msm/dpu: remove hwversion field from data structures
Abhinav Kumar
quic_abhinavk at quicinc.com
Thu Jun 2 18:47:12 UTC 2022
On 6/2/2022 6:30 AM, Dmitry Baryshkov wrote:
> The driver should not depend on hw revision for detecting features.
> Instead it should use features from the hw catalog. Drop the hwversion
> field from struct dpu_mdss_cfg and struct dpu_hw_blk_reg_map.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
Since the previous two patches remove all the current users of
hwversion, this one should be fine.
Reviewed-by: Abhinav Kumar <quic_abhinavk at quicinc.com>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 --
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 2 --
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 1 -
> 15 files changed, 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> index cff6fe3a85ac..367279371e8d 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> @@ -2002,7 +2002,6 @@ struct dpu_mdss_cfg *dpu_hw_catalog_init(u32 hw_rev)
> for (i = 0; i < ARRAY_SIZE(cfg_handler); i++) {
> if (cfg_handler[i].hw_rev == hw_rev) {
> cfg_handler[i].cfg_init(dpu_cfg);
> - dpu_cfg->hwversion = hw_rev;
> return dpu_cfg;
> }
> }
> 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 f70de97f492a..4225f58d8f97 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> @@ -826,8 +826,6 @@ struct dpu_perf_cfg {
> * @mdss_irqs: Bitmap with the irqs supported by the target
> */
> struct dpu_mdss_cfg {
> - u32 hwversion;
> -
> const struct dpu_caps *caps;
>
> u32 mdp_count;
> 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 c33e7ef611a6..7d416bf4ae91 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
> @@ -61,7 +61,6 @@ static const struct dpu_ctl_cfg *_ctl_offset(enum dpu_ctl ctl,
> b->base_off = addr;
> b->blk_off = m->ctl[i].base;
> b->length = m->ctl[i].len;
> - b->hwversion = m->hwversion;
> b->log_mask = DPU_DBG_MASK_CTL;
> return &m->ctl[i];
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
> index 4ad8991fc7d9..6f20d6b6dddd 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
> @@ -169,7 +169,6 @@ static struct dpu_dsc_cfg *_dsc_offset(enum dpu_dsc dsc,
> b->base_off = addr;
> b->blk_off = m->dsc[i].base;
> b->length = m->dsc[i].len;
> - b->hwversion = m->hwversion;
> b->log_mask = DPU_DBG_MASK_DSC;
> return &m->dsc[i];
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
> index 355894a3b48c..3e63bf4fa64e 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
> @@ -83,7 +83,6 @@ static const struct dpu_dspp_cfg *_dspp_offset(enum dpu_dspp dspp,
> b->base_off = addr;
> b->blk_off = m->dspp[i].base;
> b->length = m->dspp[i].len;
> - b->hwversion = m->hwversion;
> b->log_mask = DPU_DBG_MASK_DSPP;
> return &m->dspp[i];
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> index 61284e6c313d..01bb2d84c3a0 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> @@ -403,7 +403,6 @@ static void __intr_offset(struct dpu_mdss_cfg *m,
> {
> hw->base_off = addr;
> hw->blk_off = m->mdp[0].base;
> - hw->hwversion = m->hwversion;
> }
>
> struct dpu_hw_intr *dpu_hw_intr_init(void __iomem *addr,
> 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 3f4d2c6e1b45..b2ca8d19fdd7 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
> @@ -80,7 +80,6 @@ static const struct dpu_intf_cfg *_intf_offset(enum dpu_intf intf,
> b->base_off = addr;
> b->blk_off = m->intf[i].base;
> b->length = m->intf[i].len;
> - b->hwversion = m->hwversion;
> b->log_mask = DPU_DBG_MASK_INTF;
> return &m->intf[i];
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> index 25d2eba28e71..b41993269d09 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> @@ -46,7 +46,6 @@ static const struct dpu_lm_cfg *_lm_offset(enum dpu_lm mixer,
> b->base_off = addr;
> b->blk_off = m->mixer[i].base;
> b->length = m->mixer[i].len;
> - b->hwversion = m->hwversion;
> b->log_mask = DPU_DBG_MASK_LM;
> return &m->mixer[i];
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c
> index c06d595d5df0..b053d68d38da 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c
> @@ -26,7 +26,6 @@ static const struct dpu_merge_3d_cfg *_merge_3d_offset(enum dpu_merge_3d idx,
> b->base_off = addr;
> b->blk_off = m->merge_3d[i].base;
> b->length = m->merge_3d[i].len;
> - b->hwversion = m->hwversion;
> b->log_mask = DPU_DBG_MASK_PINGPONG;
> return &m->merge_3d[i];
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> index 47c6ab6caf95..6538e195cfe9 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
> @@ -54,7 +54,6 @@ static const struct dpu_pingpong_cfg *_pingpong_offset(enum dpu_pingpong pp,
> b->base_off = addr;
> b->blk_off = m->pingpong[i].base;
> b->length = m->pingpong[i].len;
> - b->hwversion = m->hwversion;
> b->log_mask = DPU_DBG_MASK_PINGPONG;
> return &m->pingpong[i];
> }
> 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 0a0864dff783..ab7f1a4cc578 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> @@ -772,7 +772,6 @@ static const struct dpu_sspp_cfg *_sspp_offset(enum dpu_sspp sspp,
> b->base_off = addr;
> b->blk_off = catalog->sspp[i].base;
> b->length = catalog->sspp[i].len;
> - b->hwversion = catalog->hwversion;
> b->log_mask = DPU_DBG_MASK_SSPP;
> return &catalog->sspp[i];
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c
> index ab3ef162b666..12d3b0067275 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c
> @@ -288,7 +288,6 @@ static const struct dpu_mdp_cfg *_top_offset(enum dpu_mdp mdp,
> b->base_off = addr;
> b->blk_off = m->mdp[i].base;
> b->length = m->mdp[i].len;
> - b->hwversion = m->hwversion;
> b->log_mask = DPU_DBG_MASK_TOP;
> return &m->mdp[i];
> }
> 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 e4a65eb4f769..550b2e2b3e34 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
> @@ -21,14 +21,12 @@
> * @blk_off: pipe offset relative to mdss offset
> * @length length of register block offset
> * @xin_id xin id
> - * @hwversion mdss hw version number
> */
> struct dpu_hw_blk_reg_map {
> void __iomem *base_off;
> u32 blk_off;
> u32 length;
> u32 xin_id;
> - u32 hwversion;
> u32 log_mask;
> };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
> index 046854c3fbed..789ecc531b43 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
> @@ -223,7 +223,6 @@ static const struct dpu_vbif_cfg *_top_offset(enum dpu_vbif vbif,
> b->base_off = addr;
> b->blk_off = m->vbif[i].base;
> b->length = m->vbif[i].len;
> - b->hwversion = m->hwversion;
> b->log_mask = DPU_DBG_MASK_VBIF;
> return &m->vbif[i];
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> index bcccce292937..084439fdd3a0 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> @@ -63,7 +63,6 @@ static const struct dpu_wb_cfg *_wb_offset(enum dpu_wb wb,
> b->base_off = addr;
> b->blk_off = m->wb[i].base;
> b->length = m->wb[i].len;
> - b->hwversion = m->hwversion;
> return &m->wb[i];
> }
> }
More information about the Freedreno
mailing list