Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-15
+5
-10
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+5
-10
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
···
514
514
};
515
515
516
516
static const struct dpu_vbif_cfg msm8996_vbif = {
517
-
.name = "vbif_rt", .id = VBIF_RT,
518
-
.base = 0, .len = 0x1040,
517
+
.len = 0x1040,
519
518
.default_ot_rd_limit = 32,
520
519
.default_ot_wr_limit = 16,
521
520
.features = BIT(DPU_VBIF_QOS_REMAP) | BIT(DPU_VBIF_QOS_OTLIM),
···
539
540
};
540
541
541
542
static const struct dpu_vbif_cfg msm8998_vbif = {
542
-
.name = "vbif_rt", .id = VBIF_RT,
543
-
.base = 0, .len = 0x1040,
543
+
.len = 0x1040,
544
544
.default_ot_rd_limit = 32,
545
545
.default_ot_wr_limit = 32,
546
546
.features = BIT(DPU_VBIF_QOS_REMAP) | BIT(DPU_VBIF_QOS_OTLIM),
···
566
568
};
567
569
568
570
static const struct dpu_vbif_cfg sdm845_vbif = {
569
-
.name = "vbif_rt", .id = VBIF_RT,
570
-
.base = 0, .len = 0x1040,
571
+
.len = 0x1040,
571
572
.features = BIT(DPU_VBIF_QOS_REMAP),
572
573
.xin_halt_timeout = 0x4000,
573
574
.qos_rp_remap_size = 0x40,
···
583
586
};
584
587
585
588
static const struct dpu_vbif_cfg sm8550_vbif = {
586
-
.name = "vbif_rt", .id = VBIF_RT,
587
-
.base = 0, .len = 0x1040,
589
+
.len = 0x1040,
588
590
.features = BIT(DPU_VBIF_QOS_REMAP),
589
591
.xin_halt_timeout = 0x4000,
590
592
.qos_rp_remap_size = 0x40,
···
600
604
};
601
605
602
606
static const struct dpu_vbif_cfg sm8650_vbif = {
603
-
.name = "vbif_rt", .id = VBIF_RT,
604
-
.base = 0, .len = 0x1074,
607
+
.len = 0x1074,
605
608
.features = BIT(DPU_VBIF_QOS_REMAP),
606
609
.xin_halt_timeout = 0x4000,
607
610
.qos_rp_remap_size = 0x40,
+2
-3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+2
-3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
···
587
587
588
588
/**
589
589
* struct dpu_vbif_cfg - information of VBIF blocks
590
-
* @id enum identifying this block
591
-
* @base register offset of this block
590
+
* @len: length of hardware block
592
591
* @features bit mask identifying sub-blocks/features
593
592
* @ot_rd_limit default OT read limit
594
593
* @ot_wr_limit default OT write limit
···
601
602
* @memtype array of xin memtype definitions
602
603
*/
603
604
struct dpu_vbif_cfg {
604
-
DPU_HW_BLK_INFO;
605
+
u32 len;
605
606
unsigned long features;
606
607
u32 default_ot_rd_limit;
607
608
u32 default_ot_wr_limit;
+2
-2
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
+2
-2
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
···
230
230
if (!c)
231
231
return ERR_PTR(-ENOMEM);
232
232
233
-
c->hw.blk_addr = addr + cfg->base;
233
+
c->hw.blk_addr = addr;
234
234
c->hw.log_mask = DPU_DBG_MASK_VBIF;
235
235
236
236
/*
237
237
* Assign ops
238
238
*/
239
-
c->idx = cfg->id;
239
+
c->idx = VBIF_RT;
240
240
c->cap = cfg;
241
241
_setup_vbif_ops(&c->ops, c->cap->features);
242
242