* FAILED: patch "[PATCH] drm/amdgpu: correct MEC number for gfx11 APUs" failed to apply to 6.1-stable tree
@ 2023-01-22 13:24 gregkh
2023-01-22 14:34 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: gregkh @ 2023-01-22 13:24 UTC (permalink / raw)
To: Lang.Yu, aaron.liu, alexander.deucher, yifan1.zhang; +Cc: stable
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 <stable@vger.kernel.org>.
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 <Lang.Yu@amd.com>
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 <Lang.Yu@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Reviewed-by: Yifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.1.x
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index a56c6e106d00..b9b57a66e113 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: FAILED: patch "[PATCH] drm/amdgpu: correct MEC number for gfx11 APUs" failed to apply to 6.1-stable tree
2023-01-22 13:24 FAILED: patch "[PATCH] drm/amdgpu: correct MEC number for gfx11 APUs" failed to apply to 6.1-stable tree gregkh
@ 2023-01-22 14:34 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2023-01-22 14:34 UTC (permalink / raw)
To: Lang.Yu, aaron.liu, alexander.deucher, yifan1.zhang; +Cc: stable
On Sun, Jan 22, 2023 at 02:24:49PM +0100, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
>
> Possible dependencies:
>
> 0ddadc3a2208 ("drm/amdgpu: correct MEC number for gfx11 APUs")
Now fixed this up, no need for a backport.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-22 14:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-22 13:24 FAILED: patch "[PATCH] drm/amdgpu: correct MEC number for gfx11 APUs" failed to apply to 6.1-stable tree gregkh
2023-01-22 14:34 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.