diff options
| author | Alice Ryhl <aliceryhl@google.com> | 2025-10-20 11:45:04 +0000 |
|---|---|---|
| committer | Alice Ryhl <aliceryhl@google.com> | 2025-10-20 11:49:19 +0000 |
| commit | 91321980923477044eaf91ca6445a409c4b9712e (patch) | |
| tree | c2d24d9bcad6bec4387115527b645b30a8d3bd0b /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |
| parent | 63e919a31625d5d2878cfc2511274826e29336b2 (diff) | |
| parent | 211ddde0823f1442e4ad052a2f30f050145ccada (diff) | |
Merge tag 'v6.18-rc2' into 'drm-rust-next'
When pushing commits to drm-rust-next, we need to verify that the
patches pass rustfmt. Thus, pull in v6.18-rc2 for its rustfmt fix.
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 8f6ce948c684..5ec5c3ff22bb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -811,7 +811,7 @@ int amdgpu_ring_reset_helper_end(struct amdgpu_ring *ring, if (r) return r; - /* signal the fence of the bad job */ + /* signal the guilty fence and set an error on all fences from the context */ if (guilty_fence) amdgpu_fence_driver_guilty_force_completion(guilty_fence); /* Re-emit the non-guilty commands */ |