drm/msm/dpu: drop VBIF id, base and name from the catalog

For all the platforms VBIF id is VBIF_RT, the name and base are also
fixed. Drop those fields from the catalog.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/707777/
Link: https://lore.kernel.org/r/20260227-drop-vbif-nrt-v1-4-2b97d0438182@oss.qualcomm.com

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 91fed3095a128f9189fbc0f67d10753d89ca3a05..bb4fd5fa4b22e85c364f764a0770a38f73a169f6 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -514,8 +514,7 @@ static const struct dpu_vbif_dynamic_ot_cfg msm8998_ot_rdwr_cfg[] = {
 };
 
 static const struct dpu_vbif_cfg msm8996_vbif = {
-       .name = "vbif_rt", .id = VBIF_RT,
-       .base = 0, .len = 0x1040,
+       .len = 0x1040,
        .default_ot_rd_limit = 32,
        .default_ot_wr_limit = 16,
        .features = BIT(DPU_VBIF_QOS_REMAP) | BIT(DPU_VBIF_QOS_OTLIM),
@@ -540,8 +539,7 @@ static const struct dpu_vbif_cfg msm8996_vbif = {
 };
 
 static const struct dpu_vbif_cfg msm8998_vbif = {
-       .name = "vbif_rt", .id = VBIF_RT,
-       .base = 0, .len = 0x1040,
+       .len = 0x1040,
        .default_ot_rd_limit = 32,
        .default_ot_wr_limit = 32,
        .features = BIT(DPU_VBIF_QOS_REMAP) | BIT(DPU_VBIF_QOS_OTLIM),
@@ -568,8 +566,7 @@ static const struct dpu_vbif_cfg msm8998_vbif = {
 };
 
 static const struct dpu_vbif_cfg sdm845_vbif = {
-       .name = "vbif_rt", .id = VBIF_RT,
-       .base = 0, .len = 0x1040,
+       .len = 0x1040,
        .features = BIT(DPU_VBIF_QOS_REMAP),
        .xin_halt_timeout = 0x4000,
        .qos_rp_remap_size = 0x40,
@@ -586,8 +583,7 @@ static const struct dpu_vbif_cfg sdm845_vbif = {
 };
 
 static const struct dpu_vbif_cfg sm8550_vbif = {
-       .name = "vbif_rt", .id = VBIF_RT,
-       .base = 0, .len = 0x1040,
+       .len = 0x1040,
        .features = BIT(DPU_VBIF_QOS_REMAP),
        .xin_halt_timeout = 0x4000,
        .qos_rp_remap_size = 0x40,
@@ -604,8 +600,7 @@ static const struct dpu_vbif_cfg sm8550_vbif = {
 };
 
 static const struct dpu_vbif_cfg sm8650_vbif = {
-       .name = "vbif_rt", .id = VBIF_RT,
-       .base = 0, .len = 0x1074,
+       .len = 0x1074,
        .features = BIT(DPU_VBIF_QOS_REMAP),
        .xin_halt_timeout = 0x4000,
        .qos_rp_remap_size = 0x40,

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 5a777be72fa60da9402e8f74ebddea85c438e900..c43ee4016db4712f544d1ed56ebd98600327055f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -587,8 +587,7 @@ struct dpu_vbif_qos_tbl {
 
 /**
  * struct dpu_vbif_cfg - information of VBIF blocks
- * @id                 enum identifying this block
- * @base               register offset of this block
+ * @len:               length of hardware block
  * @features           bit mask identifying sub-blocks/features
  * @ot_rd_limit        default OT read limit
  * @ot_wr_limit        default OT write limit
@@ -602,7 +601,7 @@ struct dpu_vbif_qos_tbl {
  * @memtype            array of xin memtype definitions
  */
 struct dpu_vbif_cfg {
-       DPU_HW_BLK_INFO;
+       u32 len;
        unsigned long features;
        u32 default_ot_rd_limit;
        u32 default_ot_wr_limit;

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 af76ad8a81035ca1adfde7112d49a9e2acc19b04..de70d6b00972a1a5269c1f810397ecd56c4ab4e9 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
@@ -230,13 +230,13 @@ struct dpu_hw_vbif *dpu_hw_vbif_init(struct drm_device *dev,
        if (!c)
                return ERR_PTR(-ENOMEM);
 
-       c->hw.blk_addr = addr + cfg->base;
+       c->hw.blk_addr = addr;
        c->hw.log_mask = DPU_DBG_MASK_VBIF;
 
        /*
         * Assign ops
         */
-       c->idx = cfg->id;
+       c->idx = VBIF_RT;
        c->cap = cfg;
        _setup_vbif_ops(&c->ops, c->cap->features);