Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cdb8119 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: remove amdgpu_fence_signaled 



The common kernel function does the same thing.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f556cb0c

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

+0 −1
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ int amdgpu_fence_wait_next(struct amdgpu_ring *ring); 
int amdgpu_fence_wait_empty(struct amdgpu_ring *ring);

unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring);



bool amdgpu_fence_signaled(struct amdgpu_fence *fence);

int amdgpu_fence_wait(struct amdgpu_fence *fence, bool interruptible);

signed long amdgpu_fence_wait_any(struct amdgpu_device *adev,

			  struct amdgpu_fence **fences,

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

+0 −22
Original line number Diff line number Diff line
@@ -425,28 +425,6 @@ static bool amdgpu_fence_enable_signaling(struct fence *f) 
	return true;

}



/**

 * amdgpu_fence_signaled - check if a fence has signaled

 *

 * @fence: amdgpu fence object

 *

 * Check if the requested fence has signaled (all asics).

 * Returns true if the fence has signaled or false if it has not.

 */

bool amdgpu_fence_signaled(struct amdgpu_fence *fence)

{

	if (!fence)

		return true;



	if (amdgpu_fence_seq_signaled(fence->ring, fence->seq)) {

		if (!fence_signal(&fence->base))

			FENCE_TRACE(&fence->base, "signaled from amdgpu_fence_signaled\n");

		return true;

	}



	return false;

}



/*

 * amdgpu_ring_wait_seq_timeout - wait for seq of the specific ring to signal

 * @ring: ring to wait on for the seq number

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

+4 −3
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ static void amdgpu_sa_bo_try_free(struct amdgpu_sa_manager *sa_manager) 


	sa_bo = list_entry(sa_manager->hole->next, struct amdgpu_sa_bo, olist);

	list_for_each_entry_safe_from(sa_bo, tmp, &sa_manager->olist, olist) {

		if (sa_bo->fence == NULL || !amdgpu_fence_signaled(sa_bo->fence)) {

		if (sa_bo->fence == NULL ||

		    !fence_is_signaled(&sa_bo->fence->base)) {

			return;

		}

		amdgpu_sa_bo_remove_locked(sa_bo);
@@ -274,7 +275,7 @@ static bool amdgpu_sa_bo_next_hole(struct amdgpu_sa_manager *sa_manager, 
		sa_bo = list_first_entry(&sa_manager->flist[i],

					 struct amdgpu_sa_bo, flist);



		if (!amdgpu_fence_signaled(sa_bo->fence)) {

		if (!fence_is_signaled(&sa_bo->fence->base)) {

			fences[i] = sa_bo->fence;

			continue;

		}
@@ -380,7 +381,7 @@ void amdgpu_sa_bo_free(struct amdgpu_device *adev, struct amdgpu_sa_bo **sa_bo, 


	sa_manager = (*sa_bo)->manager;

	spin_lock(&sa_manager->wq.lock);

	if (fence && !amdgpu_fence_signaled(fence)) {

	if (fence && !fence_is_signaled(&fence->base)) {

		(*sa_bo)->fence = amdgpu_fence_ref(fence);

		list_add_tail(&(*sa_bo)->flist,

			      &sa_manager->flist[fence->ring->idx]);