aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
diff options
context:
space:
mode:
authorAlex Deucher <[email protected]>2025-05-29 19:22:20 +0000
committerAlex Deucher <[email protected]>2025-07-16 20:15:22 +0000
commitb81891589be1fb6c963d3b6752a50d56fef6a030 (patch)
treed7f35467278183524bd056f62a5e4f0e87a2f3ff /drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
parentdrm/amdgpu/jpeg2.5: re-emit unprocessed state on ring reset (diff)
downloadkernel-b81891589be1fb6c963d3b6752a50d56fef6a030.tar.gz
kernel-b81891589be1fb6c963d3b6752a50d56fef6a030.zip
drm/amdgpu/jpeg3: re-emit unprocessed state on ring reset
Re-emit the unprocessed state after resetting the queue. Reviewed-by: Sathishkumar S <[email protected]> Tested-by: Sathishkumar S <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
index 5d54c882d889..d4bc4fca460c 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
@@ -565,19 +565,14 @@ static int jpeg_v3_0_ring_reset(struct amdgpu_ring *ring,
if (!(ring->adev->jpeg.supported_reset & AMDGPU_RESET_TYPE_PER_QUEUE))
return -EOPNOTSUPP;
- drm_sched_wqueue_stop(&ring->sched);
+ amdgpu_ring_reset_helper_begin(ring, timedout_fence);
r = jpeg_v3_0_stop(ring->adev);
if (r)
return r;
r = jpeg_v3_0_start(ring->adev);
if (r)
return r;
- r = amdgpu_ring_test_helper(ring);
- if (r)
- return r;
- amdgpu_fence_driver_force_completion(ring);
- drm_sched_wqueue_start(&ring->sched);
- return 0;
+ return amdgpu_ring_reset_helper_end(ring, timedout_fence);
}
static const struct amd_ip_funcs jpeg_v3_0_ip_funcs = {