drm/msm/dpu: drop empty features mask MERGE_3D_SM8150_MASK

The MERGE_3D_SM8150_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/545384/
Link: https://lore.kernel.org/r/20230704022136.130522-19-dmitry.baryshkov@linaro.org

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 f572c77..96c542d 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
@@ -273,15 +273,12 @@ static const struct dpu_merge_3d_cfg sm8150_merge_3d[] = {
        {
                .name = "merge_3d_0", .id = MERGE_3D_0,
                .base = 0x83000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_1", .id = MERGE_3D_1,
                .base = 0x83100, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_2", .id = MERGE_3D_2,
                .base = 0x83200, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        },
 };
 

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 ad63aa8..4edc106 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
@@ -272,15 +272,12 @@ static const struct dpu_merge_3d_cfg sc8180x_merge_3d[] = {
        {
                .name = "merge_3d_0", .id = MERGE_3D_0,
                .base = 0x83000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_1", .id = MERGE_3D_1,
                .base = 0x83100, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_2", .id = MERGE_3D_2,
                .base = 0x83200, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        },
 };
 

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 a9d8abe..f8910db 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
@@ -273,15 +273,12 @@ static const struct dpu_merge_3d_cfg sm8250_merge_3d[] = {
        {
                .name = "merge_3d_0", .id = MERGE_3D_0,
                .base = 0x83000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_1", .id = MERGE_3D_1,
                .base = 0x83100, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_2", .id = MERGE_3D_2,
                .base = 0x83200, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        },
 };
 

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 beaeb95..b22e6b9 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
@@ -271,15 +271,12 @@ static const struct dpu_merge_3d_cfg sm8350_merge_3d[] = {
        {
                .name = "merge_3d_0", .id = MERGE_3D_0,
                .base = 0x4e000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_1", .id = MERGE_3D_1,
                .base = 0x4f000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_2", .id = MERGE_3D_2,
                .base = 0x50000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        },
 };
 

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 3945fb5..ec959f8 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
@@ -275,15 +275,12 @@ static const struct dpu_merge_3d_cfg sc8280xp_merge_3d[] = {
        {
                .name = "merge_3d_0", .id = MERGE_3D_0,
                .base = 0x4e000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_1", .id = MERGE_3D_1,
                .base = 0x4f000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_2", .id = MERGE_3D_2,
                .base = 0x50000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        },
 };
 

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 8d6095c..98a4aae 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
@@ -291,19 +291,15 @@ static const struct dpu_merge_3d_cfg sm8450_merge_3d[] = {
        {
                .name = "merge_3d_0", .id = MERGE_3D_0,
                .base = 0x4e000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_1", .id = MERGE_3D_1,
                .base = 0x4f000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_2", .id = MERGE_3D_2,
                .base = 0x50000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_3", .id = MERGE_3D_3,
                .base = 0x65f00, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        },
 };
 

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 d2415a1..7de9ecc 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
@@ -305,19 +305,15 @@ static const struct dpu_merge_3d_cfg sm8550_merge_3d[] = {
        {
                .name = "merge_3d_0", .id = MERGE_3D_0,
                .base = 0x4e000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_1", .id = MERGE_3D_1,
                .base = 0x4f000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_2", .id = MERGE_3D_2,
                .base = 0x50000, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        }, {
                .name = "merge_3d_3", .id = MERGE_3D_3,
                .base = 0x66700, .len = 0x8,
-               .features = MERGE_3D_SM8150_MASK,
        },
 };
 

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 6570495..7641795 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -93,8 +93,6 @@
 #define CTL_SM8550_MASK \
        (CTL_SC7280_MASK | BIT(DPU_CTL_HAS_LAYER_EXT4))
 
-#define MERGE_3D_SM8150_MASK (0)
-
 #define DSPP_SC7180_MASK BIT(DPU_DSPP_PCC)
 
 #define INTF_SDM845_MASK (0)