Commit 48cbbe7c authored Jul 04, 2023 by Dmitry Baryshkov

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

parent ed4fa8c6

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,
		},
		};

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,
		},
		};

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,
		},
		};

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,
		},
		};

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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,
		},
		};