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 <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/638405/
Link: https://lore.kernel.org/r/20250220-dpu-add-cdm-v2-1-77f5f0df3d9a@linaro.org

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
index e8916ae826a6daf30eb08de53521dae89c07636c..47e01c3c242f9a2ecb201b04be5effd7ff0d04b1 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
@@ -386,7 +386,7 @@ const struct dpu_mdss_cfg dpu_sm8250_cfg = {
        .mdss_ver = &sm8250_mdss_ver,
        .caps = &sm8250_dpu_caps,
        .mdp = &sm8250_mdp,
-       .cdm = &sc7280_cdm,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm8250_ctl),
        .ctl = sm8250_ctl,
        .sspp_count = ARRAY_SIZE(sm8250_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
index 2f153e0b5c6a9e319657b99aa0954d9b190fe724..e9625c48c5677ef221b8fc80e7f9df8957b847e2 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
@@ -248,7 +248,7 @@ const struct dpu_mdss_cfg dpu_sc7280_cfg = {
        .mdss_ver = &sc7280_mdss_ver,
        .caps = &sc7280_dpu_caps,
        .mdp = &sc7280_mdp,
-       .cdm = &sc7280_cdm,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sc7280_ctl),
        .ctl = sc7280_ctl,
        .sspp_count = ARRAY_SIZE(sc7280_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h
index 76ec72a323781363d37b62fec752ea1232bbd75b..4d96ce71746f2595427649d0fdb73dae0c18be60 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h
@@ -458,7 +458,7 @@ const struct dpu_mdss_cfg dpu_sa8775p_cfg = {
        .mdss_ver = &sa8775p_mdss_ver,
        .caps = &sa8775p_dpu_caps,
        .mdp = &sa8775p_mdp,
-       .cdm = &sc7280_cdm,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sa8775p_ctl),
        .ctl = sa8775p_ctl,
        .sspp_count = ARRAY_SIZE(sa8775p_sspp),

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 0b342c043875f3329a9f71c5e751b2244f9f5ef7..ec7f42a334fc688bec468df490c81a89dd3d396d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -507,7 +507,7 @@ static const struct dpu_dsc_sub_blks dsc_sblk_1 = {
 /*************************************************************
  * CDM block config
  *************************************************************/
-static const struct dpu_cdm_cfg sc7280_cdm = {
+static const struct dpu_cdm_cfg dpu_cdm_5_x = {
        .name = "cdm_0",
        .id = CDM_0,
        .len = 0x228,