drm/amdgpu/gfx11: adjust KGQ reset sequence
Subsystems (2)
Alex Deucher
maintainerPATCH 1/2 drm/amdgpu/gfx11: adjust KGQ reset sequence
Kernel gfx queues do not need to be reinitialized or remapped after a reset. This fixes queue reset failures on APUs.
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +0 -12
@@ -6854,18 +6854,6 @@ static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring,return r; } - r =gfx_v11_0_kgq_init_queue (ring, true); -if (r) { -dev_err (adev->dev,"failed to init kgq\n" ); -return r; - } - - r =amdgpu_mes_map_legacy_queue (adev, ring,0 ); -if (r) { -dev_err (adev->dev,"failed to remap kgq\n" ); -return r; - } -return amdgpu_ring_reset_helper_end (ring, timedout_fence); }
Signature · 1 line
2.52.0
Alex Deucher
maintainerPATCH 2/2 drm/amdgpu/gfx12: adjust KGQ reset sequence
Kernel gfx queues do not need to be reinitialized or remapped after a reset. Align with other gfx11.
--- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +0 -12
@@ -5318,18 +5318,6 @@ static int gfx_v12_0_reset_kgq(struct amdgpu_ring *ring,return r; } - r =gfx_v12_0_kgq_init_queue (ring, true); -if (r) { -dev_err (adev->dev,"failed to init kgq\n" ); -return r; - } - - r =amdgpu_mes_map_legacy_queue (adev, ring,0 ); -if (r) { -dev_err (adev->dev,"failed to remap kgq\n" ); -return r; - } -return amdgpu_ring_reset_helper_end (ring, timedout_fence); }
Signature · 1 line
2.52.0
[AMD Official Use Only - AMD Internal Distribution Only]
Quoted 32 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Thursday, January 29, 2026 12:40 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu/gfx11: adjust KGQ reset sequenceKernel gfx queues do not need to be reinitialized or remapped after a reset. This fixes queue reset failures on APUs.
Fixes b3e9bfd86658 ("drm/amdgpu/gfx11: add ring reset callbacks")Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 12 ------------ 1 file changed, 12 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +0
-4@@ -6854,18 +6854,6 @@ static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring, return r; } - r =gfx_v11_0_kgq_init_queue (ring, true); -if (r) { -dev_err (adev->dev,"failed to init kgq\n" ); -return r;
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c static int gfx_v11_0_reset_kgq(struct amdgpu_ring · line 6859
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +0
-8- } - - r =amdgpu_mes_map_legacy_queue (adev, ring,0 ); -if (r) { -dev_err (adev->dev,"failed to remap kgq\n" ); -return r; - } -return amdgpu_ring_reset_helper_end (ring, timedout_fence); }
If it's reset by mmio, we might need to keep it.
So, how about adding a check like this:
static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring,
struct amdgpu_fence *timedout_fence)
{
struct amdgpu_device *adev = ring->adev;
+ bool use_mmio = false;
int r;
amdgpu_ring_reset_helper_begin(ring, timedout_fence);- r = amdgpu_mes_reset_legacy_queue(ring->adev, ring, vmid, false, 0);
+ r = amdgpu_mes_reset_legacy_queue(ring->adev, ring, vmid, user_mmio, 0);
if (r) {
dev_warn(adev->dev, "reset via MES failed and try pipe reset %d\n", r);
@@ -6874,16 +6875,18 @@ static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring,
return r;
}- r = gfx_v11_0_kgq_init_queue(ring, true);
- if (r) {
- dev_err(adev->dev, "failed to init kgq\n");
- return r;
- }
+ if (use_mmio) {
+ r = gfx_v11_0_kgq_init_queue(ring, true);
+ if (r) {
+ dev_err(adev->dev, "failed to init kgq\n");
+ return r;
+ }
...
}Quoted 2 lines
--
2.52.0
Quoted 7 lines · Central European Standard Time Alex Deucher
Kernel gfx queues do not need to be reinitialized or remapped after a reset. This fixes queue reset failures on APUs.
Fixes b3e9bfd86658 ("drm/amdgpu/gfx11: add ring reset callbacks")Signed-off-by Alex Deucher <[email protected]>
The series is:
(including with Jesse's suggestion if you choose to implement that).
I notice that gfx_v10_0_reset_kgq() also calls gfx_v10_0_kgq_init_queue(), should that call be removed as well or made conditional?
Quoted 27 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 12 ------------ 1 file changed, 12 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.cindexb5a2d09fc3469..489edf517f91c100644drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +0
-12@@ -6854,18 +6854,6 @@ static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring, return r; } - r =gfx_v11_0_kgq_init_queue (ring, true); -if (r) { -dev_err (adev->dev,"failed to init kgq\n" ); -return r; - } - - r =amdgpu_mes_map_legacy_queue (adev, ring,0 ); -if (r) { -dev_err (adev->dev,"failed to remap kgq\n" ); -return r; - } -return amdgpu_ring_reset_helper_end (ring, timedout_fence); }
Quoted 11 lines · Timur Kristóf
Quoted 7 lines · Central European Standard Time Alex Deucher
Kernel gfx queues do not need to be reinitialized or remapped after a reset. This fixes queue reset failures on APUs.
Fixes b3e9bfd86658 ("drm/amdgpu/gfx11: add ring reset callbacks")Signed-off-by Alex Deucher <[email protected]>
Quoted 6 lines
The series is:
Reviewed-by Timur Kristóf <[email protected]>(including with Jesse's suggestion if you choose to implement that).
I notice that
gfx_v10_0_reset_kgq()also callsgfx_v10_0_kgq_init_queue(), should that call be removed as well or made conditional?
In my testing, gfx10 seems to require it, but I plan to look into it deeper when I get a chance.
Alex
Quoted 32 lines
Quoted 28 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 12 ------------ 1 file changed, 12 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.cindexb5a2d09fc3469..489edf517f91c100644drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +0
-12@@ -6854,18 +6854,6 @@ static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring, return r; } - r =gfx_v11_0_kgq_init_queue (ring, true); -if (r) { -dev_err (adev->dev,"failed to init kgq\n" ); -return r; - } - - r =amdgpu_mes_map_legacy_queue (adev, ring,0 ); -if (r) { -dev_err (adev->dev,"failed to remap kgq\n" ); -return r; - } -return amdgpu_ring_reset_helper_end (ring, timedout_fence); }