drm/msm/dpu: drop empty features mask INTF_SDM845_MASK

The INTF_SDM845_MASK features mask is zero. Drop it completely.

Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Tested-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/545386/
Link: https://lore.kernel.org/r/20230704022136.130522-20-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 4ce25ed..7d87dc2 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
@@ -244,7 +244,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = {
        {
                .name = "intf_0", .id = INTF_0,
                .base = 0x6a000, .len = 0x280,
-               .features = INTF_SDM845_MASK,
                .type = INTF_DP,
                .controller_id = MSM_DP_CONTROLLER_0,
                .prog_fetch_lines_worst_case = 21,
@@ -254,7 +253,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = {
        }, {
                .name = "intf_1", .id = INTF_1,
                .base = 0x6a800, .len = 0x280,
-               .features = INTF_SDM845_MASK,
                .type = INTF_DSI,
                .controller_id = MSM_DSI_CONTROLLER_0,
                .prog_fetch_lines_worst_case = 21,
@@ -264,7 +262,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = {
        }, {
                .name = "intf_2", .id = INTF_2,
                .base = 0x6b000, .len = 0x280,
-               .features = INTF_SDM845_MASK,
                .type = INTF_DSI,
                .controller_id = MSM_DSI_CONTROLLER_1,
                .prog_fetch_lines_worst_case = 21,
@@ -274,7 +271,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = {
        }, {
                .name = "intf_3", .id = INTF_3,
                .base = 0x6b800, .len = 0x280,
-               .features = INTF_SDM845_MASK,
                .type = INTF_HDMI,
                .prog_fetch_lines_worst_case = 21,
                .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30),

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 dc760a3..87459cf 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
@@ -260,7 +260,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = {
        {
                .name = "intf_0", .id = INTF_0,
                .base = 0x6a000, .len = 0x280,
-               .features = INTF_SDM845_MASK,
                .type = INTF_DP,
                .controller_id = MSM_DP_CONTROLLER_0,
                .prog_fetch_lines_worst_case = 24,
@@ -270,7 +269,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = {
        }, {
                .name = "intf_1", .id = INTF_1,
                .base = 0x6a800, .len = 0x280,
-               .features = INTF_SDM845_MASK,
                .type = INTF_DSI,
                .controller_id = MSM_DSI_CONTROLLER_0,
                .prog_fetch_lines_worst_case = 24,
@@ -280,7 +278,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = {
        }, {
                .name = "intf_2", .id = INTF_2,
                .base = 0x6b000, .len = 0x280,
-               .features = INTF_SDM845_MASK,
                .type = INTF_DSI,
                .controller_id = MSM_DSI_CONTROLLER_1,
                .prog_fetch_lines_worst_case = 24,
@@ -290,7 +287,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = {
        }, {
                .name = "intf_3", .id = INTF_3,
                .base = 0x6b800, .len = 0x280,
-               .features = INTF_SDM845_MASK,
                .type = INTF_DP,
                .controller_id = MSM_DP_CONTROLLER_1,
                .prog_fetch_lines_worst_case = 24,

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 7641795..fdd1562 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -95,8 +95,6 @@
 
 #define DSPP_SC7180_MASK BIT(DPU_DSPP_PCC)
 
-#define INTF_SDM845_MASK (0)
-
 #define INTF_SC7180_MASK \
        (BIT(DPU_INTF_INPUT_CTRL) | \
         BIT(DPU_INTF_TE) | \