drm/amdgpu: remove amdgpu_fence_ref/unref (6ef68c17) · Commits · 戴 / test

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -447,9 +447,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);

		struct amdgpu_fence amdgpu_fence_ref(struct amdgpu_fence fence);
		void amdgpu_fence_unref(struct amdgpu_fence **fence);

		bool amdgpu_fence_need_sync(struct amdgpu_fence *fence,
		struct amdgpu_ring *ring);
		void amdgpu_fence_note_sync(struct amdgpu_fence *fence,

+0 −30

Original line number	Diff line number	Diff line
		@@ -416,36 +416,6 @@ int amdgpu_fence_wait_empty(struct amdgpu_ring *ring)
		return amdgpu_fence_ring_wait_seq(ring, seq);
		}

		/**
		* amdgpu_fence_ref - take a ref on a fence
		*
		* @fence: amdgpu fence object
		*
		* Take a reference on a fence (all asics).
		* Returns the fence.
		*/
		struct amdgpu_fence amdgpu_fence_ref(struct amdgpu_fence fence)
		{
		fence_get(&fence->base);
		return fence;
		}

		/**
		* amdgpu_fence_unref - remove a ref on a fence
		*
		* @fence: amdgpu fence object
		*
		* Remove a reference on a fence (all asics).
		*/
		void amdgpu_fence_unref(struct amdgpu_fence **fence)
		{
		struct amdgpu_fence tmp = fence;

		*fence = NULL;
		if (tmp)
		fence_put(&tmp->base);
		}

		/**
		* amdgpu_fence_count_emitted - get the count of emitted fences
		*

+2 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,8 @@ void amdgpu_ib_free(struct amdgpu_device adev, struct amdgpu_ib ib)
		{
		amdgpu_sync_free(adev, &ib->sync, &ib->fence->base);
		amdgpu_sa_bo_free(adev, &ib->sa_bo, &ib->fence->base);
		amdgpu_fence_unref(&ib->fence);
		if (ib->fence)
		fence_put(&ib->fence->base);
		}

		/**

+2 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,8 @@ static struct fence amdgpu_sched_run_job(struct amd_sched_job sched_job)
		goto err;
		}

		fence = amdgpu_fence_ref(job->ibs[job->num_ibs - 1].fence);
		fence = job->ibs[job->num_ibs - 1].fence;
		fence_get(&fence->base);

		err:
		if (job->free_job)