archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 04:04:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amdgpu: rename amdgpu_fence_driver_guilty_force_completion()

Browse source 
The function no longer signals the fence so rename it to
better match what it does.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2026-01-06 17:57:29 -05:00
parent 56fff1941a
commit ad7b68b043
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
View file

@ -708,12 +708,12 @@ void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring)
*/
/**
* amdgpu_fence_driver_guilty_force_completion - force signal of specified sequence
* amdgpu_fence_driver_update_timedout_fence_state - Update fence state and set errors
*
* @af: fence of the ring to signal
* @af: fence of the ring to update
*
*/
void amdgpu_fence_driver_guilty_force_completion(struct amdgpu_fence *af)
void amdgpu_fence_driver_update_timedout_fence_state(struct amdgpu_fence *af)
{
struct dma_fence *unprocessed;
struct dma_fence __rcu **ptr;

4
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
View file

@ -885,9 +885,9 @@ int amdgpu_ring_reset_helper_end(struct amdgpu_ring *ring,
if (r)
return r;
/* signal the guilty fence and set an error on all fences from the context */
/* set an error on all fences from the context */
if (guilty_fence)
amdgpu_fence_driver_guilty_force_completion(guilty_fence);
amdgpu_fence_driver_update_timedout_fence_state(guilty_fence);
/* Re-emit the non-guilty commands */
if (ring->ring_backup_entries_to_copy) {
amdgpu_ring_alloc_reemit(ring, ring->ring_backup_entries_to_copy);

2
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
View file

@ -161,7 +161,7 @@ extern const struct drm_sched_backend_ops amdgpu_sched_ops;
void amdgpu_fence_driver_set_error(struct amdgpu_ring *ring, int error);
void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring);
void amdgpu_fence_driver_guilty_force_completion(struct amdgpu_fence *af);
void amdgpu_fence_driver_update_timedout_fence_state(struct amdgpu_fence *af);
void amdgpu_fence_save_wptr(struct amdgpu_fence *af);
int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring);