drm/msm/dpu: drop now-unused mdss_irqs field from hw catalog

Now as the list of the interrupts is constructed from the catalog
data, drop the mdss_irqs field from catalog.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/549659/
Link: https://lore.kernel.org/r/20230727144543.1483630-5-dmitry.baryshkov@linaro.org

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
index b5fbac5..92530ae 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
@@ -342,14 +342,6 @@ const struct dpu_mdss_cfg dpu_msm8998_cfg = {
        .vbif_count = ARRAY_SIZE(msm8998_vbif),
        .vbif = msm8998_vbif,
        .perf = &msm8998_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF2_INTR) | \
-                    BIT(MDP_INTF3_INTR) | \
-                    BIT(MDP_INTF4_INTR),
 };
 
 #endif

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
index 8000b87..3034c1b 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
@@ -359,15 +359,6 @@ const struct dpu_mdss_cfg dpu_sdm845_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sdm845_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF2_INTR) | \
-                    BIT(MDP_INTF3_INTR) | \
-                    BIT(MDP_AD4_0_INTR) | \
-                    BIT(MDP_AD4_1_INTR),
 };
 
 #endif

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 7ce2d69..3745c15 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
@@ -404,17 +404,6 @@ const struct dpu_mdss_cfg dpu_sm8150_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sm8150_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF1_TEAR_INTR) | \
-                    BIT(MDP_INTF2_INTR) | \
-                    BIT(MDP_INTF2_TEAR_INTR) | \
-                    BIT(MDP_INTF3_INTR) | \
-                    BIT(MDP_AD4_0_INTR) | \
-                    BIT(MDP_AD4_1_INTR),
 };
 
 #endif

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 cea0053..6291568 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
@@ -431,19 +431,6 @@ const struct dpu_mdss_cfg dpu_sc8180x_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sc8180x_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF1_TEAR_INTR) | \
-                    BIT(MDP_INTF2_INTR) | \
-                    BIT(MDP_INTF2_TEAR_INTR) | \
-                    BIT(MDP_INTF3_INTR) | \
-                    BIT(MDP_INTF4_INTR) | \
-                    BIT(MDP_INTF5_INTR) | \
-                    BIT(MDP_AD4_0_INTR) | \
-                    BIT(MDP_AD4_1_INTR),
 };
 
 #endif

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 5fddfcc..e922668 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
@@ -225,12 +225,6 @@ const struct dpu_mdss_cfg dpu_sm6125_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sm6125_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF1_TEAR_INTR),
 };
 
 #endif

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 893d127..9751b39 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
@@ -421,16 +421,6 @@ const struct dpu_mdss_cfg dpu_sm8250_cfg = {
        .wb_count = ARRAY_SIZE(sm8250_wb),
        .wb = sm8250_wb,
        .perf = &sm8250_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF1_TEAR_INTR) | \
-                    BIT(MDP_INTF2_INTR) | \
-                    BIT(MDP_INTF2_TEAR_INTR) | \
-                    BIT(MDP_INTF3_INTR) | \
-                    BIT(MDP_INTF4_INTR),
 };
 
 #endif

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 61118f6..a9464b8 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
@@ -231,12 +231,6 @@ const struct dpu_mdss_cfg dpu_sc7180_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sc7180_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF1_TEAR_INTR),
 };
 
 #endif

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
index c0d7bb9..ae7cd96 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
@@ -161,11 +161,6 @@ const struct dpu_mdss_cfg dpu_sm6115_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sm6115_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF1_TEAR_INTR),
 };
 
 #endif

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 11c50aa..a13305c 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
@@ -234,12 +234,6 @@ const struct dpu_mdss_cfg dpu_sm6350_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sm6350_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF1_TEAR_INTR),
 };
 
 #endif

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
index 2182939..bb297c3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
@@ -151,11 +151,6 @@ const struct dpu_mdss_cfg dpu_qcm2290_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &qcm2290_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF1_TEAR_INTR),
 };
 
 #endif

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h
index f0c0aa9..014a56e 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h
@@ -173,11 +173,6 @@ const struct dpu_mdss_cfg dpu_sm6375_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sm6375_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF1_INTR) | \
-                    BIT(MDP_INTF1_TEAR_INTR),
 };
 
 #endif

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 2460ced..90efde5 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
@@ -412,15 +412,6 @@ const struct dpu_mdss_cfg dpu_sm8350_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sm8350_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_TEAR_INTR) | \
-                    BIT(MDP_INTF2_7xxx_INTR) | \
-                    BIT(MDP_INTF2_7xxx_TEAR_INTR) | \
-                    BIT(MDP_INTF3_7xxx_INTR),
 };
 
 #endif

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 a8dea8f..0a5dcec 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
@@ -281,13 +281,6 @@ const struct dpu_mdss_cfg dpu_sc7280_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sc7280_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_TEAR_INTR) | \
-                    BIT(MDP_INTF5_7xxx_INTR),
 };
 
 #endif

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
index 397fe01..7b1395f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
@@ -474,20 +474,6 @@ const struct dpu_mdss_cfg dpu_sc8280xp_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sc8280xp_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_TEAR_INTR) | \
-                    BIT(MDP_INTF2_7xxx_INTR) | \
-                    BIT(MDP_INTF2_7xxx_TEAR_INTR) | \
-                    BIT(MDP_INTF3_7xxx_INTR) | \
-                    BIT(MDP_INTF4_7xxx_INTR) | \
-                    BIT(MDP_INTF5_7xxx_INTR) | \
-                    BIT(MDP_INTF6_7xxx_INTR) | \
-                    BIT(MDP_INTF7_7xxx_INTR) | \
-                    BIT(MDP_INTF8_7xxx_INTR),
 };
 
 #endif

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 90a8461..4999f3d 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
@@ -435,15 +435,6 @@ const struct dpu_mdss_cfg dpu_sm8450_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sm8450_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_TEAR_INTR) | \
-                    BIT(MDP_INTF2_7xxx_INTR) | \
-                    BIT(MDP_INTF2_7xxx_TEAR_INTR) | \
-                    BIT(MDP_INTF3_7xxx_INTR),
 };
 
 #endif

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 c925252..401c6c2 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
@@ -449,15 +449,6 @@ const struct dpu_mdss_cfg dpu_sm8550_cfg = {
        .vbif_count = ARRAY_SIZE(sdm845_vbif),
        .vbif = sdm845_vbif,
        .perf = &sm8550_perf_data,
-       .mdss_irqs = BIT(MDP_SSPP_TOP0_INTR) | \
-                    BIT(MDP_SSPP_TOP0_INTR2) | \
-                    BIT(MDP_SSPP_TOP0_HIST_INTR) | \
-                    BIT(MDP_INTF0_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_INTR) | \
-                    BIT(MDP_INTF1_7xxx_TEAR_INTR) | \
-                    BIT(MDP_INTF2_7xxx_INTR) | \
-                    BIT(MDP_INTF2_7xxx_TEAR_INTR) | \
-                    BIT(MDP_INTF3_7xxx_INTR),
 };
 
 #endif

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
index acfe43f..c72ed0e 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -811,7 +811,6 @@ struct dpu_perf_cfg {
  * @dma_formats        Supported formats for dma pipe
  * @cursor_formats     Supported formats for cursor pipe
  * @vig_formats        Supported formats for vig pipe
- * @mdss_irqs:         Bitmap with the irqs supported by the target
  */
 struct dpu_mdss_cfg {
        const struct dpu_mdss_version *mdss_ver;
@@ -860,8 +859,6 @@ struct dpu_mdss_cfg {
        const struct dpu_format_extended *dma_formats;
        const struct dpu_format_extended *cursor_formats;
        const struct dpu_format_extended *vig_formats;
-
-       unsigned long mdss_irqs;
 };
 
 extern const struct dpu_mdss_cfg dpu_msm8998_cfg;