drm/msm/dpu: drop length from struct dpu_hw_blk_reg_map

We (nearly) do not use the length field from struct dpu_hw_blk_reg_map,
so we can drop it safely.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/488013/
Link: https://lore.kernel.org/r/20220601161349.1517667-3-dmitry.baryshkov@linaro.org
Signed-off-by: Rob Clark <robdclark@chromium.org>

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 7d416bf4ae9163c7b2538bc86cb96a09b336e833..1120ff408daec0c068de75cd248e9346436f4439 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
@@ -60,7 +60,6 @@ static const struct dpu_ctl_cfg *_ctl_offset(enum dpu_ctl ctl,
                if (ctl == m->ctl[i].id) {
                        b->base_off = addr;
                        b->blk_off = m->ctl[i].base;
-                       b->length = m->ctl[i].len;
                        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 184a1b27b13d5e3983196bda2e38e0f1b656133f..dfe6e4c119172b79af0170a7cdb820e44a41a4b3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
@@ -168,7 +168,6 @@ static struct dpu_dsc_cfg *_dsc_offset(enum dpu_dsc dsc,
                if (dsc == m->dsc[i].id) {
                        b->base_off = addr;
                        b->blk_off = m->dsc[i].base;
-                       b->length = m->dsc[i].len;
                        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 3e63bf4fa64e56a7c0c945bf4529ba4e9dc36e62..8196ae47dea8fee7edf86349c28686042ab1307c 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
@@ -82,7 +82,6 @@ static const struct dpu_dspp_cfg *_dspp_offset(enum dpu_dspp dspp,
                if (dspp == m->dspp[i].id) {
                        b->base_off = addr;
                        b->blk_off = m->dspp[i].base;
-                       b->length = m->dspp[i].len;
                        b->log_mask = DPU_DBG_MASK_DSPP;
                        return &m->dspp[i];
                }

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 90613f797ff58aee31f89c7780b4e2a2391fd9e5..3ae2a2c1cd9d63c08314ef634d9d5fe9070bd6ea 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
@@ -84,7 +84,6 @@ static const struct dpu_intf_cfg *_intf_offset(enum dpu_intf intf,
                (m->intf[i].type != INTF_NONE)) {
                        b->base_off = addr;
                        b->blk_off = m->intf[i].base;
-                       b->length = m->intf[i].len;
                        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 f1d237057ed9178e4b54aab1efcdbade1293ca5e..9a1e91962ae732feb1013e4a70015a8fe0c5861e 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
@@ -41,7 +41,6 @@ static const struct dpu_lm_cfg *_lm_offset(enum dpu_lm mixer,
                if (mixer == m->mixer[i].id) {
                        b->base_off = addr;
                        b->blk_off = m->mixer[i].base;
-                       b->length = m->mixer[i].len;
                        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 b053d68d38da20e7a38d87924a0098b94b464fdc..538691f7bf660f6a471e11c61cbeb070f8814647 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c
@@ -25,7 +25,6 @@ static const struct dpu_merge_3d_cfg *_merge_3d_offset(enum dpu_merge_3d idx,
                if (idx == m->merge_3d[i].id) {
                        b->base_off = addr;
                        b->blk_off = m->merge_3d[i].base;
-                       b->length = m->merge_3d[i].len;
                        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 6538e195cfe9487a43b5b77dbfe67e8cc5345c92..0aa63636bc9a8ff26350d7be649b15443af458e3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
@@ -53,7 +53,6 @@ static const struct dpu_pingpong_cfg *_pingpong_offset(enum dpu_pingpong pp,
                if (pp == m->pingpong[i].id) {
                        b->base_off = addr;
                        b->blk_off = m->pingpong[i].base;
-                       b->length = m->pingpong[i].len;
                        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 da4c7e4f304b46b535366a2e89dd1ecf4935ef35..876ae8faa8e5fd43be881c55897ef05508bd21ed 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
@@ -771,7 +771,6 @@ static const struct dpu_sspp_cfg *_sspp_offset(enum dpu_sspp sspp,
                        if (sspp == catalog->sspp[i].id) {
                                b->base_off = addr;
                                b->blk_off = catalog->sspp[i].base;
-                               b->length = catalog->sspp[i].len;
                                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 12d3b00672754fc1b821f9ae2f454acc202eb5d4..843cb607d411f468f2810a45f46bb46b36f666b8 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c
@@ -287,7 +287,6 @@ static const struct dpu_mdp_cfg *_top_offset(enum dpu_mdp mdp,
                if (mdp == m->mdp[i].id) {
                        b->base_off = addr;
                        b->blk_off = m->mdp[i].base;
-                       b->length = m->mdp[i].len;
                        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 377a1eef4016be9b5542d02586a7dd1483273cc7..28200d31bc5b379be75a7d600ad8a26ee1232a74 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
@@ -25,12 +25,10 @@
  * absoulute IO address
  * @base_off:     mdp register mapped offset
  * @blk_off:      pipe offset relative to mdss offset
- * @length        length of register block offset
  */
 struct dpu_hw_blk_reg_map {
        void __iomem *base_off;
        u32 blk_off;
-       u32 length;
        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 789ecc531b43a599eda3b38bc8eca384b03d2e65..41ca4b179f1a7301bb4260b6725413a822d067e4 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
@@ -222,7 +222,6 @@ static const struct dpu_vbif_cfg *_top_offset(enum dpu_vbif vbif,
                if (vbif == m->vbif[i].id) {
                        b->base_off = addr;
                        b->blk_off = m->vbif[i].base;
-                       b->length = m->vbif[i].len;
                        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 084439fdd3a0d73ed80eedb89ae7a67b4bd08076..12f32cd3075eefc38176d6992de56767a490461f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
@@ -62,7 +62,6 @@ static const struct dpu_wb_cfg *_wb_offset(enum dpu_wb wb,
                if (wb == m->wb[i].id) {
                        b->base_off = addr;
                        b->blk_off = m->wb[i].base;
-                       b->length = m->wb[i].len;
                        return &m->wb[i];
                }
        }

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index a2d71f0c96af22489b97e4ff3172c1327ee9589e..457f9c911e92f1f4fbb143d50c0b325fbae0cdf4 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -945,7 +945,7 @@ static void dpu_kms_mdp_snapshot(struct msm_disp_state *disp_state, struct msm_k
                msm_disp_snapshot_add_block(disp_state, cat->wb[i].len,
                                dpu_kms->mmio + cat->wb[i].base, "wb_%d", i);
 
-       msm_disp_snapshot_add_block(disp_state, top->hw.length,
+       msm_disp_snapshot_add_block(disp_state, cat->mdp[0].len,
                        dpu_kms->mmio + top->hw.blk_off, "top");
 
        pm_runtime_put_sync(&dpu_kms->pdev->dev);