Skip to content

Commit 51bc064

Browse files
committed
drm/msm/dpu: rename CDM block definition
The CDM block is not limited to SC7280, but it is common to all platforms since DPU 5.x. Rename it from sc7280_cdm to dpu_cdm_5_x. Reviewed-by: Abhinav Kumar <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/638405/ Link: https://lore.kernel.org/r/[email protected]
1 parent d3169ce commit 51bc064

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ const struct dpu_mdss_cfg dpu_sm8250_cfg = {
386386
.mdss_ver = &sm8250_mdss_ver,
387387
.caps = &sm8250_dpu_caps,
388388
.mdp = &sm8250_mdp,
389-
.cdm = &sc7280_cdm,
389+
.cdm = &dpu_cdm_5_x,
390390
.ctl_count = ARRAY_SIZE(sm8250_ctl),
391391
.ctl = sm8250_ctl,
392392
.sspp_count = ARRAY_SIZE(sm8250_sspp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ const struct dpu_mdss_cfg dpu_sc7280_cfg = {
248248
.mdss_ver = &sc7280_mdss_ver,
249249
.caps = &sc7280_dpu_caps,
250250
.mdp = &sc7280_mdp,
251-
.cdm = &sc7280_cdm,
251+
.cdm = &dpu_cdm_5_x,
252252
.ctl_count = ARRAY_SIZE(sc7280_ctl),
253253
.ctl = sc7280_ctl,
254254
.sspp_count = ARRAY_SIZE(sc7280_sspp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ const struct dpu_mdss_cfg dpu_sa8775p_cfg = {
458458
.mdss_ver = &sa8775p_mdss_ver,
459459
.caps = &sa8775p_dpu_caps,
460460
.mdp = &sa8775p_mdp,
461-
.cdm = &sc7280_cdm,
461+
.cdm = &dpu_cdm_5_x,
462462
.ctl_count = ARRAY_SIZE(sa8775p_ctl),
463463
.ctl = sa8775p_ctl,
464464
.sspp_count = ARRAY_SIZE(sa8775p_sspp),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ static const struct dpu_dsc_sub_blks dsc_sblk_1 = {
507507
/*************************************************************
508508
* CDM block config
509509
*************************************************************/
510-
static const struct dpu_cdm_cfg sc7280_cdm = {
510+
static const struct dpu_cdm_cfg dpu_cdm_5_x = {
511511
.name = "cdm_0",
512512
.id = CDM_0,
513513
.len = 0x228,

0 commit comments

Comments
 (0)