All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Timur Kristóf" <timur.kristof@gmail.com>
To: Jesse Zhang <Jesse.Zhang@amd.com>, amd-gfx@lists.freedesktop.org
Cc: Alexander.Deucher@amd.com,
	Christian Koenig <christian.koenig@amd.com>,
	 Lijo.Lazar@amd.com, Mario.Novales@amd.com, Manu.Rastogi@amd.com,
	 Jiongyu.Zhu@amd.com
Subject: Re: [PATCH v4 02/13] drm/amdgpu/ring: During multi-queue reset, only call begin helper if needed
Date: Thu, 19 Nov 2026 12:34:29 +0100	[thread overview]
Message-ID: <fff55a7457f9ee34c66f6f009bfaeb0f1c7323c0.camel@gmail.com> (raw)
In-Reply-To: <20261105030612.726542-2-Jesse.Zhang@amd.com>

On Thu, 2026-11-05 at 11:05 +0800, Jesse Zhang wrote:
> From: Timur Kristóf <timur.kristof@gmail.com>
> 
> This is necessary to make soft reset work after a failed queue
> reset. Otherwise the ring reset begin helper would clear out
> the guilty fence and the backed up ring contents.
> 
> v2: skip the begin helper only for the guilty ring already backed up
> by
>     the failed ring reset, and keep backing up the other rings
> (Jesse).
> 
> Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
> Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>

Thanks for including this patch.

Considering that this fixes a real issue with repeated soft reset, I
recommend adding a Fixes tag to this commit:

Fixes: 1fc76380c6ce ("drm/amdgpu: Add IP block soft reset as a GPU recovery method")


> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index edae764eb0c4..c71e1c3b6d7b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -1027,8 +1027,10 @@ void
> amdgpu_multi_ring_reset_helper_begin(struct amdgpu_device *adev,
>  		 * Backup current contents of the ring.
>  		 * The helper takes care to only reemit unsignalled
> fences
>  		 * so we don't have to worry about that here.
> +		 * A failed ring reset of the same job already
> backed it up.
>  		 */
> -		amdgpu_ring_reset_helper_begin(ring,
> ring_guilty_fence);
> +		if (ring != guilty_ring || ring->guilty_fence !=
> guilty_fence)
> +			amdgpu_ring_reset_helper_begin(ring,
> ring_guilty_fence);
>  	}
>  }
>  

  parent reply	other threads:[~2026-11-19 11:34 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-05  3:05 [PATCH v4 01/13] drm/amdgpu: pass the device to the multi ring reset helpers Jesse Zhang
2026-11-05  3:05 ` [PATCH v4 02/13] drm/amdgpu/ring: During multi-queue reset, only call begin helper if needed Jesse Zhang
2026-11-11 23:52   ` Daniel Campos Ramos
2026-11-19 11:34   ` Timur Kristóf [this message]
2026-11-05  3:05 ` [PATCH v4 03/13] drm/amdgpu: add an engine scope to the IP block soft reset Jesse Zhang
2026-11-19 11:35   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 04/13] drm/amdgpu/gfx: add callbacks to save and restore a gfx HQD Jesse Zhang
2026-11-19 11:35   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 05/13] drm/amdgpu/gfx12: " Jesse Zhang
2026-11-19 11:35   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 06/13] drm/amdgpu/gfx11: " Jesse Zhang
2026-11-19 11:36   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 07/13] drm/amdgpu/userq: add a helper to signal the fences of a queue up to a point Jesse Zhang
2026-11-19 11:36   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 08/13] drm/amdgpu/userq: add helpers to keep the user queues of one engine across a reset Jesse Zhang
2026-11-19 11:36   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 09/13] drm/amdgpu/gfx12: add a gfx engine soft reset Jesse Zhang
2026-11-19 11:42   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 10/13] drm/amdgpu/gfx11: " Jesse Zhang
2026-11-19 11:47   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 11/13] drm/amdgpu/userq: reset the gfx engine when a gfx user queue reset fails Jesse Zhang
2026-11-19 11:47   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 12/13] drm/amdgpu/gfx12: enable the gfx engine soft reset Jesse Zhang
2026-11-19 11:47   ` Timur Kristóf
2026-11-05  3:05 ` [PATCH v4 13/13] drm/amdgpu/gfx11: " Jesse Zhang
2026-11-19 11:47   ` Timur Kristóf
2026-11-10  2:06 ` [PATCH v4 01/13] drm/amdgpu: pass the device to the multi ring reset helpers Zhang, Jesse(Jie)
2026-11-11 15:28   ` Timur Kristóf
2026-11-19 11:33 ` Timur Kristóf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fff55a7457f9ee34c66f6f009bfaeb0f1c7323c0.camel@gmail.com \
    --to=timur.kristof@gmail.com \
    --cc=Alexander.Deucher@amd.com \
    --cc=Jesse.Zhang@amd.com \
    --cc=Jiongyu.Zhu@amd.com \
    --cc=Lijo.Lazar@amd.com \
    --cc=Manu.Rastogi@amd.com \
    --cc=Mario.Novales@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=christian.koenig@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.