drm/msm/dpu: remove hwversion field from data structures

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.

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/488160/
Link: https://lore.kernel.org/r/20220602202447.1755115-4-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

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 6647cdedbd75cd9cac8142fc40a07b1249958271..61271d9013a11f06caa3b33c9303a663c7a1d03c 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -2004,7 +2004,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 f70de97f492aa042d6123280cb73c8b79db05773..4225f58d8f97760a449ec0d34248af9a6303e251 100644 (file)
--- 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 c33e7ef611a6cb508f9ddc9d8e5dc1d57bbc74c6..7d416bf4ae9163c7b2538bc86cb96a09b336e833 100644 (file)
--- 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 4ad8991fc7d9d93431c1e01cb0efdc5d03b8a38d..6f20d6b6dddd0f651e2b1d66e1442c48a3271364 100644 (file)
--- 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 355894a3b48c376612e2491bbbb5f88b8be3eb4e..3e63bf4fa64e56a7c0c945bf4529ba4e9dc36e62 100644 (file)
--- 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 61284e6c313dadc8284ededd0691383ac4311859..01bb2d84c3a0557fd818abacd8b48538934db42f 100644 (file)
--- 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 3f4d2c6e1b452d78ce99a7f67c79aa79dfa01f5b..b2ca8d19fdd7931cf6893daa861e8353c903692f 100644 (file)
--- 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 25d2eba28e7177d783e75d7824a6b53f9467a140..b41993269d0917deb83da9c1968122701666dc10 100644 (file)
--- 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 c06d595d5df0f8ed6394d1ea03628f5b50262a97..b053d68d38da20e7a38d87924a0098b94b464fdc 100644 (file)
--- 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 47c6ab6caf953717bdd05c3fa90bb539e2a187af..6538e195cfe9487a43b5b77dbfe67e8cc5345c92 100644 (file)
--- 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 0a0864dff78379cd8462a8aa0ec4e51c0c184432..ab7f1a4cc578fadb1365a8d91e0dff1124791ce0 100644 (file)
--- 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 ab3ef162b66682836e93bb8c31e3b4b084e9fb21..12d3b00672754fc1b821f9ae2f454acc202eb5d4 100644 (file)
--- 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 e4a65eb4f7690d8e799a59e2ac8b79aa5fa25b61..550b2e2b3e34877f0a928c8d92a1bc0212edf2b3 100644 (file)
--- 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 046854c3fbed0265ebd7fe8126c0b1f376a07bc8..789ecc531b43a599eda3b38bc8eca384b03d2e65 100644 (file)
--- 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 bcccce292937d850b52a888d33ac575f3e854494..084439fdd3a0d73ed80eedb89ae7a67b4bd08076 100644 (file)
--- 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];
                }
        }