[PATCH] drm/msm/mdp5: Remove MSM8974v1

[PATCH] drm/msm/mdp5: Remove MSM8974v1

[Konrad Dybcio]

From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

To the best of my knowledge, the v1 version of this SoC had been
superseded before any device was released on the market. Everywhere
else in the kernel, there are assumptions about the SoC being revision
2 or the later MSM8974PRO.

Remove the config for that flavor of MDP. To bring the naming in line
with the rest of the kernel, remove the v2 suffix from the remaining
config.

Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
related: https://lore.kernel.org/linux-arm-msm/20260109083808.1047-1-yuanjie.yang@oss.qualcomm.com/T/#m579aac6cddd5bd5b0adfa778061e6397082014fe
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
 drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 94 +-------------------------------
 1 file changed, 2 insertions(+), 92 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
index 69fef034d0df..7c91fc1915f3 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
@@ -14,95 +14,6 @@ struct mdp5_cfg_handler {
 /* mdp5_cfg must be exposed (used in mdp5.xml.h) */
 const struct mdp5_cfg_hw *mdp5_cfg = NULL;
 
-static const struct mdp5_cfg_hw msm8x74v1_config = {
-	.name = "msm8x74v1",
-	.mdp = {
-		.count = 1,
-		.caps = MDP_CAP_SMP |
-			0,
-	},
-	.smp = {
-		.mmb_count = 22,
-		.mmb_size = 4096,
-		.clients = {
-			[SSPP_VIG0] =  1, [SSPP_VIG1] =  4, [SSPP_VIG2] =  7,
-			[SSPP_DMA0] = 10, [SSPP_DMA1] = 13,
-			[SSPP_RGB0] = 16, [SSPP_RGB1] = 17, [SSPP_RGB2] = 18,
-		},
-	},
-	.ctl = {
-		.count = 5,
-		.base = { 0x00500, 0x00600, 0x00700, 0x00800, 0x00900 },
-		.flush_hw_mask = 0x0003ffff,
-	},
-	.pipe_vig = {
-		.count = 3,
-		.base = { 0x01100, 0x01500, 0x01900 },
-		.caps = MDP_PIPE_CAP_HFLIP |
-			MDP_PIPE_CAP_VFLIP |
-			MDP_PIPE_CAP_SCALE |
-			MDP_PIPE_CAP_CSC   |
-			0,
-	},
-	.pipe_rgb = {
-		.count = 3,
-		.base = { 0x01d00, 0x02100, 0x02500 },
-		.caps = MDP_PIPE_CAP_HFLIP |
-			MDP_PIPE_CAP_VFLIP |
-			MDP_PIPE_CAP_SCALE |
-			0,
-	},
-	.pipe_dma = {
-		.count = 2,
-		.base = { 0x02900, 0x02d00 },
-		.caps = MDP_PIPE_CAP_HFLIP |
-			MDP_PIPE_CAP_VFLIP |
-			0,
-	},
-	.lm = {
-		.count = 5,
-		.base = { 0x03100, 0x03500, 0x03900, 0x03d00, 0x04100 },
-		.instances = {
-				{ .id = 0, .pp = 0, .dspp = 0,
-				  .caps = MDP_LM_CAP_DISPLAY, },
-				{ .id = 1, .pp = 1, .dspp = 1,
-				  .caps = MDP_LM_CAP_DISPLAY, },
-				{ .id = 2, .pp = 2, .dspp = 2,
-				  .caps = MDP_LM_CAP_DISPLAY, },
-				{ .id = 3, .pp = -1, .dspp = -1,
-				  .caps = MDP_LM_CAP_WB },
-				{ .id = 4, .pp = -1, .dspp = -1,
-				  .caps = MDP_LM_CAP_WB },
-			     },
-		.nb_stages = 5,
-		.max_width = 2048,
-		.max_height = 0xFFFF,
-	},
-	.dspp = {
-		.count = 3,
-		.base = { 0x04500, 0x04900, 0x04d00 },
-	},
-	.pp = {
-		.count = 3,
-		.base = { 0x21a00, 0x21b00, 0x21c00 },
-	},
-	.intf = {
-		.base = { 0x21000, 0x21200, 0x21400, 0x21600 },
-		.connect = {
-			[0] = INTF_eDP,
-			[1] = INTF_DSI,
-			[2] = INTF_DSI,
-			[3] = INTF_HDMI,
-		},
-	},
-	.perf = {
-		.ab_inefficiency = 200,
-		.ib_inefficiency = 120,
-		.clk_inefficiency = 125
-	},
-	.max_clk = 200000000,
-};
-
 static const struct mdp5_cfg_hw msm8x26_config = {
 	.name = "msm8x26",
 	.mdp = {
@@ -184,7 +95,7 @@ static const struct mdp5_cfg_hw msm8x26_config = {
 	.max_clk = 200000000,
 };
 
-static const struct mdp5_cfg_hw msm8x74v2_config = {
+static const struct mdp5_cfg_hw msm8x74_config = {
 	.name = "msm8x74",
 	.mdp = {
 		.count = 1,
@@ -1098,9 +1009,8 @@ static const struct mdp5_cfg_hw msm8937_config = {
 };
 
 static const struct mdp5_cfg_handler cfg_handlers_v1[] = {
-	{ .revision = 0, .config = { .hw = &msm8x74v1_config } },
 	{ .revision = 1, .config = { .hw = &msm8x26_config } },
-	{ .revision = 2, .config = { .hw = &msm8x74v2_config } },
+	{ .revision = 2, .config = { .hw = &msm8x74_config } },
 	{ .revision = 3, .config = { .hw = &apq8084_config } },
 	{ .revision = 6, .config = { .hw = &msm8x16_config } },
 	{ .revision = 8, .config = { .hw = &msm8x36_config } },

---
base-commit: 3fa5e5702a82d259897bd7e209469bc06368bf31
change-id: 20260302-topic-goodnight_8974v1-c1eaab4aa08c

Best regards,
-- 
Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Re: [PATCH] drm/msm/mdp5: Remove MSM8974v1

[Dmitry Baryshkov]

On Mon, Mar 02, 2026 at 02:41:26PM +0100, Konrad Dybcio wrote:
> From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> 
> To the best of my knowledge, the v1 version of this SoC had been
> superseded before any device was released on the market. Everywhere
> else in the kernel, there are assumptions about the SoC being revision
> 2 or the later MSM8974PRO.
> 
> Remove the config for that flavor of MDP. To bring the naming in line
> with the rest of the kernel, remove the v2 suffix from the remaining
> config.
> 
> Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> ---
> related: https://lore.kernel.org/linux-arm-msm/20260109083808.1047-1-yuanjie.yang@oss.qualcomm.com/T/#m579aac6cddd5bd5b0adfa778061e6397082014fe
> Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> ---
>  drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 94 +-------------------------------
>  1 file changed, 2 insertions(+), 92 deletions(-)
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>


-- 
With best wishes
Dmitry

Claude review: drm/msm/mdp5: Remove MSM8974v1

[Claude Code Review Bot]

Patch Review

**Correctness**: The patch correctly removes the `msm8x74v1_config` definition (92 lines of dead config) and its handler table entry `{ .revision = 0, ... }`. The rename from `msm8x74v2_config` to `msm8x74_config` is consistent — the `.name` field was already `"msm8x74"` (without any version suffix), so the C symbol now matches the reported name.

The lookup logic in `mdp5_cfg_init()` iterates `cfg_handlers_v1[]` matching on `minor` revision number. With the revision 0 entry removed, any v1 hardware attempting to probe would fail with the existing `"unexpected MDP minor revision"` error at line 1163, which is the correct behavior for unsupported hardware.

**Minor issue — duplicate `Signed-off-by` tag**: The commit message has `Signed-off-by: Konrad Dybcio` appearing twice — once before the `---` separator and once after it (lines 91 and 94 of the mbox). The one after `---` won't be included in the final commit by git-am, but the duplication looks accidental — possibly a b4 artifact.

```
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
related: https://lore.kernel.org/...
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
```

**No functional concerns**: The remaining revision 2 entry (`msm8x74_config`) is untouched in content, only renamed. No other file references `msm8x74v1_config` or `msm8x74v2_config` by name (they are only used via the handler table), so no other files need updating.

Overall: This is a clean removal patch. The rationale is sound (v1 silicon never shipped commercially), and the implementation is correct. The only nit is the duplicate Signed-off-by.

---
Generated by Claude Code Patch Reviewer

Claude review: drm/msm/mdp5: Remove MSM8974v1

[Claude Code Review Bot]

Overall Series Review

Subject: drm/msm/mdp5: Remove MSM8974v1
Author: Konrad Dybcio <konradybcio@kernel.org>
Patches: 2
Reviewed: 2026-03-03T13:20:38.128002

---

This is a single cleanup patch that removes the MSM8974v1 MDP5 configuration from the driver, with the rationale that the v1 silicon was never shipped in any consumer device. The patch is straightforward: it deletes the `msm8x74v1_config` struct, removes the corresponding `cfg_handlers_v1` entry for revision 0, and renames `msm8x74v2_config` to `msm8x74_config` to align with naming elsewhere in the kernel.

The change is clean and well-motivated. There is one minor cosmetic issue and one point worth confirming, but neither is blocking.

---
Generated by Claude Code Patch Reviewer