[AMD Official Use Only - AMD Internal Distribution Only]
> -----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 sequence
>
> 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")
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4789
> Signed-off-by: Alex Deucher <[email protected]>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> index b5a2d09fc3469..489edf517f91c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> @@ -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); }
>
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;
+ }
...
}
> --
> 2.52.0
