Skip to content

Commit d5c1e00

Browse files
committed
drm/msm/dpu: enable CDM_0 for DPUs 1.x - 4.x
Enable the CDM_0 block on DPU versions 1.x - 4.x as documented in the vendor dtsi file. Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/638408/ Link: https://lore.kernel.org/r/[email protected]
1 parent 15f2825 commit d5c1e00

File tree

10 files changed

+16
-0
lines changed

10 files changed

+16
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ const struct dpu_mdss_cfg dpu_msm8937_cfg = {
190190
.mdss_ver = &msm8937_mdss_ver,
191191
.caps = &msm8937_dpu_caps,
192192
.mdp = msm8937_mdp,
193+
.cdm = &dpu_cdm_1_x_4_x,
193194
.ctl_count = ARRAY_SIZE(msm8937_ctl),
194195
.ctl = msm8937_ctl,
195196
.sspp_count = ARRAY_SIZE(msm8937_sspp),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ const struct dpu_mdss_cfg dpu_msm8917_cfg = {
167167
.mdss_ver = &msm8917_mdss_ver,
168168
.caps = &msm8917_dpu_caps,
169169
.mdp = msm8917_mdp,
170+
.cdm = &dpu_cdm_1_x_4_x,
170171
.ctl_count = ARRAY_SIZE(msm8917_ctl),
171172
.ctl = msm8917_ctl,
172173
.sspp_count = ARRAY_SIZE(msm8917_sspp),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ const struct dpu_mdss_cfg dpu_msm8953_cfg = {
198198
.mdss_ver = &msm8953_mdss_ver,
199199
.caps = &msm8953_dpu_caps,
200200
.mdp = msm8953_mdp,
201+
.cdm = &dpu_cdm_1_x_4_x,
201202
.ctl_count = ARRAY_SIZE(msm8953_ctl),
202203
.ctl = msm8953_ctl,
203204
.sspp_count = ARRAY_SIZE(msm8953_sspp),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ const struct dpu_mdss_cfg dpu_msm8996_cfg = {
316316
.mdss_ver = &msm8996_mdss_ver,
317317
.caps = &msm8996_dpu_caps,
318318
.mdp = msm8996_mdp,
319+
.cdm = &dpu_cdm_1_x_4_x,
319320
.ctl_count = ARRAY_SIZE(msm8996_ctl),
320321
.ctl = msm8996_ctl,
321322
.sspp_count = ARRAY_SIZE(msm8996_sspp),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ const struct dpu_mdss_cfg dpu_msm8998_cfg = {
302302
.mdss_ver = &msm8998_mdss_ver,
303303
.caps = &msm8998_dpu_caps,
304304
.mdp = &msm8998_mdp,
305+
.cdm = &dpu_cdm_1_x_4_x,
305306
.ctl_count = ARRAY_SIZE(msm8998_ctl),
306307
.ctl = msm8998_ctl,
307308
.sspp_count = ARRAY_SIZE(msm8998_sspp),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ const struct dpu_mdss_cfg dpu_sdm660_cfg = {
269269
.mdss_ver = &sdm660_mdss_ver,
270270
.caps = &sdm660_dpu_caps,
271271
.mdp = &sdm660_mdp,
272+
.cdm = &dpu_cdm_1_x_4_x,
272273
.ctl_count = ARRAY_SIZE(sdm660_ctl),
273274
.ctl = sdm660_ctl,
274275
.sspp_count = ARRAY_SIZE(sdm660_sspp),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ const struct dpu_mdss_cfg dpu_sdm630_cfg = {
205205
.mdss_ver = &sdm630_mdss_ver,
206206
.caps = &sdm630_dpu_caps,
207207
.mdp = &sdm630_mdp,
208+
.cdm = &dpu_cdm_1_x_4_x,
208209
.ctl_count = ARRAY_SIZE(sdm630_ctl),
209210
.ctl = sdm630_ctl,
210211
.sspp_count = ARRAY_SIZE(sdm630_sspp),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ const struct dpu_mdss_cfg dpu_sdm845_cfg = {
319319
.mdss_ver = &sdm845_mdss_ver,
320320
.caps = &sdm845_dpu_caps,
321321
.mdp = &sdm845_mdp,
322+
.cdm = &dpu_cdm_1_x_4_x,
322323
.ctl_count = ARRAY_SIZE(sdm845_ctl),
323324
.ctl = sdm845_ctl,
324325
.sspp_count = ARRAY_SIZE(sdm845_sspp),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ const struct dpu_mdss_cfg dpu_sdm670_cfg = {
132132
.mdss_ver = &sdm670_mdss_ver,
133133
.caps = &sdm845_dpu_caps,
134134
.mdp = &sdm670_mdp,
135+
.cdm = &dpu_cdm_1_x_4_x,
135136
.ctl_count = ARRAY_SIZE(sdm845_ctl),
136137
.ctl = sdm845_ctl,
137138
.sspp_count = ARRAY_SIZE(sdm670_sspp),

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,13 @@ static const struct dpu_dsc_sub_blks dsc_sblk_1 = {
507507
/*************************************************************
508508
* CDM block config
509509
*************************************************************/
510+
static const struct dpu_cdm_cfg dpu_cdm_1_x_4_x = {
511+
.name = "cdm_0",
512+
.id = CDM_0,
513+
.len = 0x224,
514+
.base = 0x79200,
515+
};
516+
510517
static const struct dpu_cdm_cfg dpu_cdm_5_x = {
511518
.name = "cdm_0",
512519
.id = CDM_0,

0 commit comments

Comments
 (0)