diff options
| author | Alex Deucher <[email protected]> | 2025-05-29 19:24:11 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2025-07-16 20:16:36 +0000 |
| commit | 8bea669e67aab1147d674d989202956b7e79ec36 (patch) | |
| tree | 8c6b7140fff328c72a0535c0a709f47b4fd5debf /drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | |
| parent | drm/amdgpu/jpeg5: add queue reset (diff) | |
| download | kernel-8bea669e67aab1147d674d989202956b7e79ec36.tar.gz kernel-8bea669e67aab1147d674d989202956b7e79ec36.zip | |
drm/amdgpu/jpeg5.0.1: re-emit unprocessed state on ring reset
Re-emit the unprocessed state after resetting the queue.
Reviewed-by: Sathishkumar S <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c index 6f8a16da9d60..5473cbaa5c0e 100644 --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c @@ -838,20 +838,13 @@ static int jpeg_v5_0_1_ring_reset(struct amdgpu_ring *ring, unsigned int vmid, struct amdgpu_fence *timedout_fence) { - int r; - if (amdgpu_sriov_vf(ring->adev)) return -EOPNOTSUPP; - drm_sched_wqueue_stop(&ring->sched); + amdgpu_ring_reset_helper_begin(ring, timedout_fence); jpeg_v5_0_1_core_stall_reset(ring); jpeg_v5_0_1_init_jrbc(ring); - 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_v5_0_1_ip_funcs = { |