On 6/17/25 05:07, Alex Deucher wrote: > Going forward, we'll need more than just the vmid. Add the > guilty amdgpu_fence. > > Signed-off-by: Alex Deucher <[email protected]>
Maybe not name it guilty_fence since that is not necessary the case for SDMA for example. Maybe just fence or timedout or something like that. Apart from that feel free to add Reviewed-by: Christian König <[email protected]>. Regards, Christian. > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 +++-- > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 7 +++++-- > drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 8 ++++++-- > drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 8 ++++++-- > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 ++- > drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 3 ++- > drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 4 +++- > drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 4 +++- > 22 files changed, 70 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > index ddb9d3269357c..a7ff1fa4c778e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > @@ -155,7 +155,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct > drm_sched_job *s_job) > if (is_guilty) > dma_fence_set_error(&s_job->s_fence->finished, -ETIME); > > - r = amdgpu_ring_reset(ring, job->vmid); > + r = amdgpu_ring_reset(ring, job->vmid, NULL); > if (!r) { > if (amdgpu_ring_sched_ready(ring)) > drm_sched_stop(&ring->sched, s_job); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h > index 9ae522baad8e7..fc36b86c6dcf8 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h > @@ -268,7 +268,8 @@ struct amdgpu_ring_funcs { > void (*patch_cntl)(struct amdgpu_ring *ring, unsigned offset); > void (*patch_ce)(struct amdgpu_ring *ring, unsigned offset); > void (*patch_de)(struct amdgpu_ring *ring, unsigned offset); > - int (*reset)(struct amdgpu_ring *ring, unsigned int vmid); > + int (*reset)(struct amdgpu_ring *ring, unsigned int vmid, > + struct amdgpu_fence *guilty_fence); > void (*emit_cleaner_shader)(struct amdgpu_ring *ring); > bool (*is_guilty)(struct amdgpu_ring *ring); > }; > @@ -425,7 +426,7 @@ struct amdgpu_ring { > #define amdgpu_ring_patch_cntl(r, o) ((r)->funcs->patch_cntl((r), (o))) > #define amdgpu_ring_patch_ce(r, o) ((r)->funcs->patch_ce((r), (o))) > #define amdgpu_ring_patch_de(r, o) ((r)->funcs->patch_de((r), (o))) > -#define amdgpu_ring_reset(r, v) (r)->funcs->reset((r), (v)) > +#define amdgpu_ring_reset(r, v, f) (r)->funcs->reset((r), (v), (f)) > > unsigned int amdgpu_ring_max_ibs(enum amdgpu_ring_type type); > int amdgpu_ring_alloc(struct amdgpu_ring *ring, unsigned ndw); > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c > index 75ea071744eb5..444753b0ac885 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c > @@ -9522,7 +9522,9 @@ static void gfx_v10_ring_insert_nop(struct amdgpu_ring > *ring, uint32_t num_nop) > amdgpu_ring_insert_nop(ring, num_nop - 1); > } > > -static int gfx_v10_0_reset_kgq(struct amdgpu_ring *ring, unsigned int vmid) > +static int gfx_v10_0_reset_kgq(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > struct amdgpu_kiq *kiq = &adev->gfx.kiq[0]; > @@ -9579,7 +9581,8 @@ static int gfx_v10_0_reset_kgq(struct amdgpu_ring > *ring, unsigned int vmid) > } > > static int gfx_v10_0_reset_kcq(struct amdgpu_ring *ring, > - unsigned int vmid) > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > struct amdgpu_kiq *kiq = &adev->gfx.kiq[0]; > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c > index ec9b84f92d467..4293f2a1b9bfb 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c > @@ -6811,7 +6811,9 @@ static int gfx_v11_reset_gfx_pipe(struct amdgpu_ring > *ring) > return 0; > } > > -static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring, unsigned int vmid) > +static int gfx_v11_0_reset_kgq(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > int r; > @@ -6973,7 +6975,9 @@ static int gfx_v11_0_reset_compute_pipe(struct > amdgpu_ring *ring) > return 0; > } > > -static int gfx_v11_0_reset_kcq(struct amdgpu_ring *ring, unsigned int vmid) > +static int gfx_v11_0_reset_kcq(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > int r = 0; > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c > index 1234c8d64e20d..aea21ef177d05 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c > @@ -5307,7 +5307,9 @@ static int gfx_v12_reset_gfx_pipe(struct amdgpu_ring > *ring) > return 0; > } > > -static int gfx_v12_0_reset_kgq(struct amdgpu_ring *ring, unsigned int vmid) > +static int gfx_v12_0_reset_kgq(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > int r; > @@ -5421,7 +5423,9 @@ static int gfx_v12_0_reset_compute_pipe(struct > amdgpu_ring *ring) > return 0; > } > > -static int gfx_v12_0_reset_kcq(struct amdgpu_ring *ring, unsigned int vmid) > +static int gfx_v12_0_reset_kcq(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > int r; > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > index d50e125fd3e0d..c0ffe7afca9b8 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > @@ -7153,7 +7153,8 @@ static void gfx_v9_ring_insert_nop(struct amdgpu_ring > *ring, uint32_t num_nop) > } > > static int gfx_v9_0_reset_kcq(struct amdgpu_ring *ring, > - unsigned int vmid) > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > struct amdgpu_kiq *kiq = &adev->gfx.kiq[0]; > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c > b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c > index c233edf605694..79d4ae0645ffc 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c > @@ -3552,7 +3552,8 @@ static int gfx_v9_4_3_reset_hw_pipe(struct amdgpu_ring > *ring) > } > > static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring *ring, > - unsigned int vmid) > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > struct amdgpu_kiq *kiq = &adev->gfx.kiq[ring->xcc_id]; > diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c > b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c > index 4cde8a8bcc837..4c1ff6d0e14ea 100644 > --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c > @@ -764,7 +764,9 @@ static int jpeg_v2_0_process_interrupt(struct > amdgpu_device *adev, > return 0; > } > > -static int jpeg_v2_0_ring_reset(struct amdgpu_ring *ring, unsigned int vmid) > +static int jpeg_v2_0_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > jpeg_v2_0_stop(ring->adev); > jpeg_v2_0_start(ring->adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c > b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c > index 8b39e114f3be1..5a18b8644de2f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c > +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c > @@ -643,7 +643,9 @@ static int jpeg_v2_5_process_interrupt(struct > amdgpu_device *adev, > return 0; > } > > -static int jpeg_v2_5_ring_reset(struct amdgpu_ring *ring, unsigned int vmid) > +static int jpeg_v2_5_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > jpeg_v2_5_stop_inst(ring->adev, ring->me); > jpeg_v2_5_start_inst(ring->adev, ring->me); > diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c > b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c > index 2f8510c2986b9..4963feddefae5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c > @@ -555,7 +555,9 @@ static int jpeg_v3_0_process_interrupt(struct > amdgpu_device *adev, > return 0; > } > > -static int jpeg_v3_0_ring_reset(struct amdgpu_ring *ring, unsigned int vmid) > +static int jpeg_v3_0_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > jpeg_v3_0_stop(ring->adev); > jpeg_v3_0_start(ring->adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c > b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c > index f17ec5414fd69..327adb474b0d3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c > @@ -720,7 +720,9 @@ static int jpeg_v4_0_process_interrupt(struct > amdgpu_device *adev, > return 0; > } > > -static int jpeg_v4_0_ring_reset(struct amdgpu_ring *ring, unsigned int vmid) > +static int jpeg_v4_0_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > if (amdgpu_sriov_vf(ring->adev)) > return -EINVAL; > diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c > b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c > index 79e342d5ab28d..c951b4b170c5b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c > +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c > @@ -1143,7 +1143,9 @@ static void jpeg_v4_0_3_core_stall_reset(struct > amdgpu_ring *ring) > WREG32_SOC15(JPEG, jpeg_inst, regJPEG_CORE_RST_CTRL, 0x00); > } > > -static int jpeg_v4_0_3_ring_reset(struct amdgpu_ring *ring, unsigned int > vmid) > +static int jpeg_v4_0_3_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > if (amdgpu_sriov_vf(ring->adev)) > return -EOPNOTSUPP; > 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 3b6f65a256464..51ae62c24c49e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c > +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c > @@ -834,7 +834,9 @@ static void jpeg_v5_0_1_core_stall_reset(struct > amdgpu_ring *ring) > WREG32_SOC15(JPEG, jpeg_inst, regJPEG_CORE_RST_CTRL, 0x00); > } > > -static int jpeg_v5_0_1_ring_reset(struct amdgpu_ring *ring, unsigned int > vmid) > +static int jpeg_v5_0_1_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > if (amdgpu_sriov_vf(ring->adev)) > return -EOPNOTSUPP; > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c > index 5b7009612190f..502d71f678922 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c > @@ -1674,7 +1674,9 @@ static bool sdma_v4_4_2_page_ring_is_guilty(struct > amdgpu_ring *ring) > return sdma_v4_4_2_is_queue_selected(adev, instance_id, true); > } > > -static int sdma_v4_4_2_reset_queue(struct amdgpu_ring *ring, unsigned int > vmid) > +static int sdma_v4_4_2_reset_queue(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > u32 id = ring->me; > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c > index 37f4b5b4a098f..6092e2a9e210b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c > @@ -1539,7 +1539,9 @@ static int sdma_v5_0_soft_reset(struct amdgpu_ip_block > *ip_block) > return 0; > } > > -static int sdma_v5_0_reset_queue(struct amdgpu_ring *ring, unsigned int vmid) > +static int sdma_v5_0_reset_queue(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > u32 inst_id = ring->me; > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c > index 0b40411b92a0b..2cdcf28881c3d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c > @@ -1452,7 +1452,9 @@ static int sdma_v5_2_wait_for_idle(struct > amdgpu_ip_block *ip_block) > return -ETIMEDOUT; > } > > -static int sdma_v5_2_reset_queue(struct amdgpu_ring *ring, unsigned int vmid) > +static int sdma_v5_2_reset_queue(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > u32 inst_id = ring->me; > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c > index 5a70ae17be04e..43bb4a7456b90 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c > @@ -1537,7 +1537,9 @@ static int sdma_v6_0_ring_preempt_ib(struct amdgpu_ring > *ring) > return r; > } > > -static int sdma_v6_0_reset_queue(struct amdgpu_ring *ring, unsigned int vmid) > +static int sdma_v6_0_reset_queue(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > int i, r; > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c > index ad47d0bdf7775..b5c168cb1354d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c > @@ -802,7 +802,9 @@ static bool sdma_v7_0_check_soft_reset(struct > amdgpu_ip_block *ip_block) > return false; > } > > -static int sdma_v7_0_reset_queue(struct amdgpu_ring *ring, unsigned int vmid) > +static int sdma_v7_0_reset_queue(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > int i, r; > diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c > b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c > index b5071f77f78d2..083fde15e83a1 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c > @@ -1967,7 +1967,9 @@ static int vcn_v4_0_ring_patch_cs_in_place(struct > amdgpu_cs_parser *p, > return 0; > } > > -static int vcn_v4_0_ring_reset(struct amdgpu_ring *ring, unsigned int vmid) > +static int vcn_v4_0_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[ring->me]; > diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c > b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c > index 5a33140f57235..57c59c4868a50 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c > +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c > @@ -1594,7 +1594,9 @@ static void vcn_v4_0_3_unified_ring_set_wptr(struct > amdgpu_ring *ring) > } > } > > -static int vcn_v4_0_3_ring_reset(struct amdgpu_ring *ring, unsigned int vmid) > +static int vcn_v4_0_3_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > int r = 0; > int vcn_inst; > diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c > b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c > index 16ade84facc78..4aad7d2e36379 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c > +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c > @@ -1465,7 +1465,9 @@ static void vcn_v4_0_5_unified_ring_set_wptr(struct > amdgpu_ring *ring) > } > } > > -static int vcn_v4_0_5_ring_reset(struct amdgpu_ring *ring, unsigned int vmid) > +static int vcn_v4_0_5_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[ring->me]; > diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c > b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c > index f8e3f0b882da5..b9c8a2b8c5e0d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c > @@ -1192,7 +1192,9 @@ static void vcn_v5_0_0_unified_ring_set_wptr(struct > amdgpu_ring *ring) > } > } > > -static int vcn_v5_0_0_ring_reset(struct amdgpu_ring *ring, unsigned int vmid) > +static int vcn_v5_0_0_ring_reset(struct amdgpu_ring *ring, > + unsigned int vmid, > + struct amdgpu_fence *guilty_fence) > { > struct amdgpu_device *adev = ring->adev; > struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[ring->me];
