Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: correct MEC number for gfx11 APUs" failed to apply to 6.1-stable tree

PATCH [email protected] 1 participant 2 messages Jan 22, 2023

Subsystems (3)
Stable branch DRM drivers Radeon and amdgpu DRM drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

0ddadc3a2208 ("drm/amdgpu: correct MEC number for gfx11 APUs")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 0ddadc3a2208aedb1b27dbb76d0b4e722b5b527a Mon Sep 17 00:00:00 2001
From: Lang Yu <[email protected]>
Date: Wed, 11 Jan 2023 09:52:11 +0800
Subject: [PATCH] drm/amdgpu: correct MEC number for gfx11 APUs

There is only one MEC on these APUs.

Signed-off-by Lang Yu <[email protected]>
Reviewed-by Aaron Liu <[email protected]>
Reviewed-by Yifan Zhang <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
Cc [email protected] # 6.1.x
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +9 -2
index a56c6e106d00..b9b57a66e113 100644
@@ -1287,10 +1287,8 @@ static int gfx_v11_0_sw_init(void *handle)
 
 	switch (adev->ip_versions[GC_HWIP][0]) {
 	case IP_VERSION(11, 0, 0):
-	case IP_VERSION(11, 0, 1):
 	case IP_VERSION(11, 0, 2):
 	case IP_VERSION(11, 0, 3):
-	case IP_VERSION(11, 0, 4):
 		adev->gfx.me.num_me = 1;
 		adev->gfx.me.num_pipe_per_me = 1;
 		adev->gfx.me.num_queue_per_pipe = 1;

@@ -1298,6 +1296,15 @@ static int gfx_v11_0_sw_init(void *handle)
 		adev->gfx.mec.num_pipe_per_mec = 4;
 		adev->gfx.mec.num_queue_per_pipe = 4;
 		break;
+	case IP_VERSION(11, 0, 1):
+	case IP_VERSION(11, 0, 4):
+		adev->gfx.me.num_me = 1;
+		adev->gfx.me.num_pipe_per_me = 1;
+		adev->gfx.me.num_queue_per_pipe = 1;
+		adev->gfx.mec.num_mec = 1;
+		adev->gfx.mec.num_pipe_per_mec = 4;
+		adev->gfx.mec.num_queue_per_pipe = 4;
+		break;
 	default:
 		adev->gfx.me.num_me = 1;
 		adev->gfx.me.num_pipe_per_me = 1;
author maintainer
#1 lore raw
Quoted 9 lines · On Sun, Jan 22, 2023 at 02:24:49PM +0100, [email protected] wrote:

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

0ddadc3a2208 ("drm/amdgpu: correct MEC number for gfx11 APUs")

Now fixed this up, no need for a backport.

greg k-h