diff options
| author | Alex Deucher <[email protected]> | 2025-06-05 20:12:08 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2025-06-30 15:57:16 +0000 |
| commit | 787e2ce10fdce2b95a9ad81cc244ef22b0c200fe (patch) | |
| tree | e4ba04353b92e20952a07bc60a4dab03bbf39978 /drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | |
| parent | drm/amdgpu: remove job parameter from amdgpu_fence_emit() (diff) | |
| download | kernel-787e2ce10fdce2b95a9ad81cc244ef22b0c200fe.tar.gz kernel-787e2ce10fdce2b95a9ad81cc244ef22b0c200fe.zip | |
drm/amdgpu: update ring reset function signature
Going forward, we'll need more than just the vmid. Add the
guilty amdgpu_fence.
Reviewed-by: Christian König <[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 | 4 |
1 files changed, 3 insertions, 1 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 3b6f65a25646..aee4f50a0f52 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 *timedout_fence) { if (amdgpu_sriov_vf(ring->adev)) return -EOPNOTSUPP; |