Commit ad7b68b0 authored by Alex Deucher's avatar Alex Deucher
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 56fff194

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

+3 −3
Original line number Diff line number Diff line
@@ -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;

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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);