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

Commit 336d1f5e authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: remove HW fence owner 



Not used any more since we now always use the sheduler.

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

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

+2 −7
Original line number Diff line number Diff line
@@ -409,9 +409,6 @@ struct amdgpu_fence { 
	struct amdgpu_ring		*ring;

	uint64_t			seq;



	/* filp or special value for fence creator */

	void				*owner;



	wait_queue_t			fence_wake;

};
@@ -432,8 +429,7 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, 
				   unsigned irq_type);

void amdgpu_fence_driver_suspend(struct amdgpu_device *adev);

void amdgpu_fence_driver_resume(struct amdgpu_device *adev);

int amdgpu_fence_emit(struct amdgpu_ring *ring, void *owner,

		      struct amdgpu_fence **fence);

int amdgpu_fence_emit(struct amdgpu_ring *ring, struct amdgpu_fence **fence);

void amdgpu_fence_process(struct amdgpu_ring *ring);

int amdgpu_fence_wait_next(struct amdgpu_ring *ring);

int amdgpu_fence_wait_empty(struct amdgpu_ring *ring);
@@ -1177,8 +1173,7 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
		  unsigned size, struct amdgpu_ib *ib);

void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib);

int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,

		       struct amdgpu_ib *ib, void *owner,

		       struct fence *last_vm_update,

		       struct amdgpu_ib *ib, struct fence *last_vm_update,

		       struct fence **f);

int amdgpu_ib_pool_init(struct amdgpu_device *adev);

void amdgpu_ib_pool_fini(struct amdgpu_device *adev);

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

+1 −5
Original line number Diff line number Diff line
@@ -91,25 +91,21 @@ static u32 amdgpu_fence_read(struct amdgpu_ring *ring) 
 * amdgpu_fence_emit - emit a fence on the requested ring

 *

 * @ring: ring the fence is associated with

 * @owner: creator of the fence

 * @fence: amdgpu fence object

 *

 * Emits a fence command on the requested ring (all asics).

 * Returns 0 on success, -ENOMEM on failure.

 */

int amdgpu_fence_emit(struct amdgpu_ring *ring, void *owner,

		      struct amdgpu_fence **fence)

int amdgpu_fence_emit(struct amdgpu_ring *ring, struct amdgpu_fence **fence)

{

	struct amdgpu_device *adev = ring->adev;



	/* we are protected by the ring emission mutex */

	*fence = kmem_cache_alloc(amdgpu_fence_slab, GFP_KERNEL);

	if ((*fence) == NULL) {

		return -ENOMEM;

	}

	(*fence)->seq = ++ring->fence_drv.sync_seq;

	(*fence)->ring = ring;

	(*fence)->owner = owner;

	fence_init(&(*fence)->base, &amdgpu_fence_ops,

		&ring->fence_drv.fence_queue.lock,

		adev->fence_context + ring->idx,

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

+2 −4
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib) 
 * @adev: amdgpu_device pointer

 * @num_ibs: number of IBs to schedule

 * @ibs: IB objects to schedule

 * @owner: owner for creating the fences

 * @f: fence created during this submission

 *

 * Schedule an IB on the associated ring (all asics).
@@ -118,8 +117,7 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib) 
 * to SI there was just a DE IB.

 */

int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,

		       struct amdgpu_ib *ibs, void *owner,

		       struct fence *last_vm_update,

		       struct amdgpu_ib *ibs, struct fence *last_vm_update,

		       struct fence **f)

{

	struct amdgpu_device *adev = ring->adev;
@@ -183,7 +181,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
			amdgpu_ring_emit_hdp_invalidate(ring);

	}



	r = amdgpu_fence_emit(ring, owner, &ib->fence);

	r = amdgpu_fence_emit(ring, &ib->fence);

	if (r) {

		dev_err(adev->dev, "failed to emit fence (%d)\n", r);

		ring->current_ctx = old_ctx;

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static struct fence *amdgpu_job_run(struct amd_sched_job *sched_job) 
	}



	trace_amdgpu_sched_run_job(job);

	r = amdgpu_ib_schedule(job->ring, job->num_ibs, job->ibs, job->owner,

	r = amdgpu_ib_schedule(job->ring, job->num_ibs, job->ibs,

			       job->sync.last_vm_update, &fence);

	if (r) {

		DRM_ERROR("Error scheduling IBs (%d)\n", r);

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

+1 −7
Original line number Diff line number Diff line
@@ -60,12 +60,8 @@ void amdgpu_sync_create(struct amdgpu_sync *sync) 
 */

static bool amdgpu_sync_same_dev(struct amdgpu_device *adev, struct fence *f)

{

	struct amdgpu_fence *a_fence = to_amdgpu_fence(f);

	struct amd_sched_fence *s_fence = to_amd_sched_fence(f);



	if (a_fence)

		return a_fence->ring->adev == adev;



	if (s_fence) {

		struct amdgpu_ring *ring;
@@ -85,13 +81,11 @@ static bool amdgpu_sync_same_dev(struct amdgpu_device *adev, struct fence *f) 
 */

static void *amdgpu_sync_get_owner(struct fence *f)

{

	struct amdgpu_fence *a_fence = to_amdgpu_fence(f);

	struct amd_sched_fence *s_fence = to_amd_sched_fence(f);



	if (s_fence)

		return s_fence->owner;

	else if (a_fence)

		return a_fence->owner;



	return AMDGPU_FENCE_OWNER_UNDEFINED;

}