Skip to content

Commit 989412e

Browse files
Esha Bharadwajlumag
authored andcommitted
drm/msm/dpu: Add CWB entry to catalog for SM8650
Add a new block for concurrent writeback mux to the SM8650 HW catalog Signed-off-by: Esha Bharadwaj <quic_ebharadw@quicinc.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/629219/ Link: https://lore.kernel.org/r/20241216-concurrent-wb-v4-9-fe220297a7f0@quicinc.com
1 parent 835d106 commit 989412e

2 files changed

Lines changed: 34 additions & 0 deletions

File tree

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,25 @@ static const struct dpu_wb_cfg sm8650_wb[] = {
352352
},
353353
};
354354

355+
static const struct dpu_cwb_cfg sm8650_cwb[] = {
356+
{
357+
.name = "cwb_0", .id = CWB_0,
358+
.base = 0x66200, .len = 0x8,
359+
},
360+
{
361+
.name = "cwb_1", .id = CWB_1,
362+
.base = 0x66600, .len = 0x8,
363+
},
364+
{
365+
.name = "cwb_2", .id = CWB_2,
366+
.base = 0x7E200, .len = 0x8,
367+
},
368+
{
369+
.name = "cwb_3", .id = CWB_3,
370+
.base = 0x7E600, .len = 0x8,
371+
},
372+
};
373+
355374
static const struct dpu_intf_cfg sm8650_intf[] = {
356375
{
357376
.name = "intf_0", .id = INTF_0,
@@ -449,6 +468,8 @@ const struct dpu_mdss_cfg dpu_sm8650_cfg = {
449468
.merge_3d = sm8650_merge_3d,
450469
.wb_count = ARRAY_SIZE(sm8650_wb),
451470
.wb = sm8650_wb,
471+
.cwb_count = ARRAY_SIZE(sm8650_cwb),
472+
.cwb = sm8650_cwb,
452473
.intf_count = ARRAY_SIZE(sm8650_intf),
453474
.intf = sm8650_intf,
454475
.vbif_count = ARRAY_SIZE(sm8650_vbif),

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,16 @@ struct dpu_wb_cfg {
613613
enum dpu_clk_ctrl_type clk_ctrl;
614614
};
615615

616+
/*
617+
* struct dpu_cwb_cfg : MDP CWB mux instance info
618+
* @id: enum identifying this block
619+
* @base: register base offset to mdss
620+
* @features bit mask identifying sub-blocks/features
621+
*/
622+
struct dpu_cwb_cfg {
623+
DPU_HW_BLK_INFO;
624+
};
625+
616626
/**
617627
* struct dpu_vbif_dynamic_ot_cfg - dynamic OT setting
618628
* @pps pixel per seconds
@@ -815,6 +825,9 @@ struct dpu_mdss_cfg {
815825
u32 dspp_count;
816826
const struct dpu_dspp_cfg *dspp;
817827

828+
u32 cwb_count;
829+
const struct dpu_cwb_cfg *cwb;
830+
818831
/* Add additional block data structures here */
819832

820833
const struct dpu_perf_cfg *perf;

0 commit comments

Comments
 (0)