drm/msm/dpu: enable CDM_0 for DPUs 5.x+

Enable the CDM_0 block on DPU generations starting from 5.x as
documented in the vendor dtsi file.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/638407/
Link: https://lore.kernel.org/r/20250220-dpu-add-cdm-v2-2-77f5f0df3d9a@linaro.org

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
index bcb39807fe61e231d6e318d8729ed86f213fb06a..85fde7243dd4d011ed1e3a5719fd6c98cf7d6e77 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
@@ -452,6 +452,7 @@ const struct dpu_mdss_cfg dpu_sm8650_cfg = {
        .mdss_ver = &sm8650_mdss_ver,
        .caps = &sm8650_dpu_caps,
        .mdp = &sm8650_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm8650_ctl),
        .ctl = sm8650_ctl,
        .sspp_count = ARRAY_SIZE(sm8650_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
index 36cc9dbc00b5c1219e1aa557dd4ee0e801b5c9e7..23188290001ffb45563a9953a9f710bacb4dac89 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
@@ -388,6 +388,7 @@ const struct dpu_mdss_cfg dpu_sm8150_cfg = {
        .mdss_ver = &sm8150_mdss_ver,
        .caps = &sm8150_dpu_caps,
        .mdp = &sm8150_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm8150_ctl),
        .ctl = sm8150_ctl,
        .sspp_count = ARRAY_SIZE(sm8150_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
index e8eacdb47967a227567a96a85a93a69befbb00d5..de8ccf589f1fe026ca0697d48f9533befda4659d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
@@ -414,6 +414,7 @@ const struct dpu_mdss_cfg dpu_sc8180x_cfg = {
        .mdss_ver = &sc8180x_mdss_ver,
        .caps = &sc8180x_dpu_caps,
        .mdp = &sc8180x_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sc8180x_ctl),
        .ctl = sc8180x_ctl,
        .sspp_count = ARRAY_SIZE(sc8180x_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
index 2fe674d1e05988f39f66a01fedee96113437ea65..b2ebf76e386718b95292e119d53e67f5d9f0743a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
@@ -309,6 +309,7 @@ const struct dpu_mdss_cfg dpu_sm7150_cfg = {
        .mdss_ver = &sm7150_mdss_ver,
        .caps = &sm7150_dpu_caps,
        .mdp = &sm7150_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm7150_ctl),
        .ctl = sm7150_ctl,
        .sspp_count = ARRAY_SIZE(sm7150_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
index 744012892b7c132c68627897dc49ac2da8e24a39..2b4aea177bcac82107e8f68e9b6c2700bf6d7f8f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
@@ -248,6 +248,7 @@ const struct dpu_mdss_cfg dpu_sm6150_cfg = {
        .mdss_ver = &sm6150_mdss_ver,
        .caps = &sm6150_dpu_caps,
        .mdp = &sm6150_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm6150_ctl),
        .ctl = sm6150_ctl,
        .sspp_count = ARRAY_SIZE(sm6150_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
index 76f60a2df7a890c5346fe248d67d646ade574fe4..cc2951112bdadca60fe51faeecb81e57280662c3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
@@ -216,6 +216,7 @@ const struct dpu_mdss_cfg dpu_sm6125_cfg = {
        .mdss_ver = &sm6125_mdss_ver,
        .caps = &sm6125_dpu_caps,
        .mdp = &sm6125_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm6125_ctl),
        .ctl = sm6125_ctl,
        .sspp_count = ARRAY_SIZE(sm6125_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
index 7382ebb6e5b2a0c1190e914fb593da93879c0d9a..42a00550eefbc10e97515340d6d8b33d4ef5e3fd 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
@@ -204,6 +204,7 @@ const struct dpu_mdss_cfg dpu_sc7180_cfg = {
        .mdss_ver = &sc7180_mdss_ver,
        .caps = &sc7180_dpu_caps,
        .mdp = &sc7180_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sc7180_ctl),
        .ctl = sc7180_ctl,
        .sspp_count = ARRAY_SIZE(sc7180_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
index 0502cee2f116e8ce24a0daf995f46b1d693aacaa..828a02429405238807562dd0aa29575f8367fdc7 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
@@ -222,6 +222,7 @@ const struct dpu_mdss_cfg dpu_sm6350_cfg = {
        .mdss_ver = &sm6350_mdss_ver,
        .caps = &sm6350_dpu_caps,
        .mdp = &sm6350_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm6350_ctl),
        .ctl = sm6350_ctl,
        .sspp_count = ARRAY_SIZE(sm6350_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
index f7c08e89c882038aa658955ca1202bda3d928e80..795e9ebf8c11dcc7d7cae7444fc3e386ced5792d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
@@ -396,6 +396,7 @@ const struct dpu_mdss_cfg dpu_sm8350_cfg = {
        .mdss_ver = &sm8350_mdss_ver,
        .caps = &sm8350_dpu_caps,
        .mdp = &sm8350_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm8350_ctl),
        .ctl = sm8350_ctl,
        .sspp_count = ARRAY_SIZE(sm8350_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
index 08742472f9cc812fbaf8f842ff7bd78f597e2b8d..048dfb9dbb601bdbbf6a1326a7af8680f2777b5d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
@@ -412,6 +412,7 @@ const struct dpu_mdss_cfg dpu_sm8450_cfg = {
        .mdss_ver = &sm8450_mdss_ver,
        .caps = &sm8450_dpu_caps,
        .mdp = &sm8450_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm8450_ctl),
        .ctl = sm8450_ctl,
        .sspp_count = ARRAY_SIZE(sm8450_sspp),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
index 4d3787fceb72fb3641057a7ea04ae6503b671042..a5b90e5e31202900c0bb5bc4a705a6b269005474 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
@@ -407,6 +407,7 @@ const struct dpu_mdss_cfg dpu_sm8550_cfg = {
        .mdss_ver = &sm8550_mdss_ver,
        .caps = &sm8550_dpu_caps,
        .mdp = &sm8550_mdp,
+       .cdm = &dpu_cdm_5_x,
        .ctl_count = ARRAY_SIZE(sm8550_ctl),
        .ctl = sm8550_ctl,
        .sspp_count = ARRAY_SIZE(sm8550_sspp),