Skip to content

Commit ad7b68b

Browse files
committed
drm/amdgpu: rename amdgpu_fence_driver_guilty_force_completion()
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>
1 parent 56fff19 commit ad7b68b

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -708,12 +708,12 @@ void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring)
708708
*/
709709

710710
/**
711-
* amdgpu_fence_driver_guilty_force_completion - force signal of specified sequence
711+
* amdgpu_fence_driver_update_timedout_fence_state - Update fence state and set errors
712712
*
713-
* @af: fence of the ring to signal
713+
* @af: fence of the ring to update
714714
*
715715
*/
716-
void amdgpu_fence_driver_guilty_force_completion(struct amdgpu_fence *af)
716+
void amdgpu_fence_driver_update_timedout_fence_state(struct amdgpu_fence *af)
717717
{
718718
struct dma_fence *unprocessed;
719719
struct dma_fence __rcu **ptr;

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,9 +885,9 @@ int amdgpu_ring_reset_helper_end(struct amdgpu_ring *ring,
885885
if (r)
886886
return r;
887887

888-
/* signal the guilty fence and set an error on all fences from the context */
888+
/* set an error on all fences from the context */
889889
if (guilty_fence)
890-
amdgpu_fence_driver_guilty_force_completion(guilty_fence);
890+
amdgpu_fence_driver_update_timedout_fence_state(guilty_fence);
891891
/* Re-emit the non-guilty commands */
892892
if (ring->ring_backup_entries_to_copy) {
893893
amdgpu_ring_alloc_reemit(ring, ring->ring_backup_entries_to_copy);

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ extern const struct drm_sched_backend_ops amdgpu_sched_ops;
161161

162162
void amdgpu_fence_driver_set_error(struct amdgpu_ring *ring, int error);
163163
void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring);
164-
void amdgpu_fence_driver_guilty_force_completion(struct amdgpu_fence *af);
164+
void amdgpu_fence_driver_update_timedout_fence_state(struct amdgpu_fence *af);
165165
void amdgpu_fence_save_wptr(struct amdgpu_fence *af);
166166

167167
int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring);

0 commit comments

Comments
 (0)