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

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

drm/amdgpu: directly return fence from ib_schedule 



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

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

+2 −1
Original line number Diff line number Diff line
@@ -1181,7 +1181,8 @@ 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 amdgpu_ib *ib, void *owner,

		       struct fence **f);

int amdgpu_ib_pool_init(struct amdgpu_device *adev);

void amdgpu_ib_pool_fini(struct amdgpu_device *adev);

int amdgpu_ib_ring_tests(struct amdgpu_device *adev);

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

+6 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib) 
 * @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).

 * Returns 0 on success, error on failure.
@@ -119,7 +120,8 @@ 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 amdgpu_ib *ibs, void *owner,

		       struct fence **f)

{

	struct amdgpu_device *adev = ring->adev;

	struct amdgpu_ib *ib = &ibs[0];
@@ -200,6 +202,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
				       AMDGPU_FENCE_FLAG_64BIT);

	}



	if (f)

		*f = fence_get(&ib->fence->base);



	amdgpu_ring_commit(ring);

	return 0;

}

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

+4 −6
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static struct fence *amdgpu_sched_dependency(struct amd_sched_job *sched_job) 


static struct fence *amdgpu_sched_run_job(struct amd_sched_job *sched_job)

{

	struct amdgpu_fence *fence = NULL;

	struct fence *fence = NULL;

	struct amdgpu_job *job;

	int r;
@@ -98,21 +98,19 @@ static struct fence *amdgpu_sched_run_job(struct amd_sched_job *sched_job) 
	}

	job = to_amdgpu_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->owner, &fence);

	if (r) {

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

		goto err;

	}



	fence = job->ibs[job->num_ibs - 1].fence;

	fence_get(&fence->base);



err:

	if (job->free_job)

		job->free_job(job);



	kfree(job);

	return fence ? &fence->base : NULL;

	return fence;

}



struct amd_sched_backend_ops amdgpu_sched_ops = {