Re: [PATCH 02/10] drm/amdgpu: rename amdgpu_fence_driver_guilty_force_completion()

["Christian König" <christian.koenig@amd.com>]

On 1/16/26 17:20, Alex Deucher wrote:
> The function no longer signals the fence so rename it to
> better match what it does.
> 
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 +++---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c  | 4 ++--
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h  | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> index f2f0288b7dce4..c7a2dff33d80b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> @@ -709,12 +709,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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index 600e6bb98af7a..b82357c657237 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -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);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> index 87c9df6c2ecfe..cb0fb1a989d2f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> @@ -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);