From: Alex Deucher <alexander.deucher@amd.com>
To: <amd-gfx@lists.freedesktop.org>, <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Subject: [PATCH 16/28] drm/amdgpu/sdma7: re-emit unprocessed state on ring reset
Date: Thu, 29 May 2025 16:07:46 -0400 [thread overview]
Message-ID: <20250529200758.6326-17-alexander.deucher@amd.com> (raw)
In-Reply-To: <20250529200758.6326-1-alexander.deucher@amd.com>
Re-emit the unprocessed state after resetting the queue.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
index c9993424b3923..808fc658dc040 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
@@ -823,8 +823,11 @@ static int sdma_v7_0_reset_queue(struct amdgpu_ring *ring, unsigned int vmid)
if (r)
return r;
- amdgpu_fence_driver_force_completion(ring);
- return sdma_v7_0_gfx_resume_instance(adev, i, true);
+ r = sdma_v7_0_gfx_resume_instance(adev, i, true);
+ if (r)
+ return r;
+
+ return amdgpu_ring_reemit_unprocessed_jobs(ring);
}
/**
--
2.49.0
next prev parent reply other threads:[~2025-05-29 20:08 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-29 20:07 [PATCH V5 00/28] Reset improvements for GC10+ Alex Deucher
2025-05-29 20:07 ` [PATCH 01/28] drm/amdgpu: enable legacy enforce isolation by default Alex Deucher
2025-06-02 12:41 ` Christian König
2025-05-29 20:07 ` [PATCH 02/28] drm/amdgpu/gfx7: drop reset_kgq Alex Deucher
2025-06-02 12:47 ` Christian König
2025-06-02 14:36 ` Alex Deucher
2025-05-29 20:07 ` [PATCH 03/28] drm/amdgpu/gfx8: " Alex Deucher
2025-05-29 20:07 ` [PATCH 04/28] drm/amdgpu/gfx9: " Alex Deucher
2025-05-29 20:07 ` [PATCH 05/28] drm/amdgpu: rework queue reset scheduler interaction Alex Deucher
2025-05-29 20:07 ` [PATCH 06/28] drm/amdgpu: move force completion into ring resets Alex Deucher
2025-06-02 14:22 ` Christian König
2025-05-29 20:07 ` [PATCH 07/28] drm/amdgpu: track ring state associated with a job Alex Deucher
2025-06-02 14:27 ` Christian König
2025-06-02 22:42 ` Alex Deucher
2025-06-03 8:03 ` Christian König
2025-06-03 14:27 ` Alex Deucher
2025-06-03 15:01 ` Christian König
2025-06-03 15:18 ` Alex Deucher
2025-06-03 16:25 ` Alex Deucher
2025-05-29 20:07 ` [PATCH 08/28] drm/amdgpu/gfx10: re-emit unprocessed state on ring reset Alex Deucher
2025-05-29 20:07 ` [PATCH 09/28] drm/amdgpu/gfx11: " Alex Deucher
2025-05-29 20:07 ` [PATCH 10/28] drm/amdgpu/gfx12: " Alex Deucher
2025-05-29 20:07 ` [PATCH 11/28] drm/amdgpu/gfx9: re-emit unprocessed state on kcq reset Alex Deucher
2025-05-29 20:07 ` [PATCH 12/28] drm/amdgpu/gfx9.4.3: " Alex Deucher
2025-05-29 20:07 ` [PATCH 13/28] drm/amdgpu/sdma5: re-emit unprocessed state on ring reset Alex Deucher
2025-05-29 20:07 ` [PATCH 14/28] drm/amdgpu/sdma5.2: " Alex Deucher
2025-05-29 20:07 ` [PATCH 15/28] drm/amdgpu/sdma6: " Alex Deucher
2025-05-29 20:07 ` Alex Deucher [this message]
2025-05-29 20:07 ` [PATCH 17/28] drm/amdgpu/jpeg2: " Alex Deucher
2025-05-29 20:07 ` [PATCH 18/28] drm/amdgpu/jpeg2.5: " Alex Deucher
2025-05-29 20:07 ` [PATCH 19/28] drm/amdgpu/jpeg3: " Alex Deucher
2025-05-29 20:07 ` [PATCH 20/28] drm/amdgpu/jpeg4: " Alex Deucher
2025-05-29 20:07 ` [PATCH 21/28] drm/amdgpu/jpeg4.0.3: " Alex Deucher
2025-05-29 20:07 ` [PATCH 22/28] drm/amdgpu/jpeg5.0.0: add queue reset Alex Deucher
2025-05-29 20:07 ` [PATCH 23/28] drm/amdgpu/jpeg5: re-emit unprocessed state on ring reset Alex Deucher
2025-05-29 20:07 ` [PATCH 24/28] drm/amdgpu/jpeg5.0.1: " Alex Deucher
2025-05-29 20:07 ` [PATCH 25/28] drm/amdgpu/vcn4: " Alex Deucher
2025-05-29 20:07 ` [PATCH 26/28] drm/amdgpu/vcn4.0.3: " Alex Deucher
2025-05-29 20:07 ` [PATCH 27/28] drm/amdgpu/vcn4.0.5: " Alex Deucher
2025-05-29 20:07 ` [PATCH 28/28] drm/amdgpu/vcn5: " Alex Deucher
2025-05-29 20:54 ` [PATCH V5 00/28] Reset improvements for GC10+ Alex Deucher
2025-05-31 17:18 ` Alex Deucher
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=20250529200758.6326-17-alexander.deucher@amd.com \
--to=alexander.deucher@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.