Commit f7d66fb2 authored by Christian König's avatar Christian König
Browse files

drm/amdgpu: cleanup scheduler job initialization v2 



Init the DRM scheduler base class while allocating the job.

This makes the whole handling much more cleaner.

v2: fix coding style

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221014084641.128280-7-christian.koenig@amd.com
parent 940ca22b

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

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ int amdgpu_amdkfd_submit_ib(struct amdgpu_device *adev, 
		goto err;

	}



	ret = amdgpu_job_alloc(adev, 1, &job, NULL);

	ret = amdgpu_job_alloc(adev, NULL, NULL, NULL, 1, &job);

	if (ret)

		goto err;

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

+2 −6
Original line number Diff line number Diff line
@@ -291,12 +291,8 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p, 
		return -EINVAL;



	for (i = 0; i < p->gang_size; ++i) {

		ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);

		if (ret)

			goto free_all_kdata;



		ret = drm_sched_job_init(&p->jobs[i]->base, p->entities[i],

					 &fpriv->vm);

		ret = amdgpu_job_alloc(p->adev, vm, p->entities[i], vm,

				       num_ibs[i], &p->jobs[i]);

		if (ret)

			goto free_all_kdata;

	}

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

+23 −21
Original line number Diff line number Diff line
@@ -89,8 +89,9 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 
	return DRM_GPU_SCHED_STAT_NOMINAL;

}



int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,

		     struct amdgpu_job **job, struct amdgpu_vm *vm)

int amdgpu_job_alloc(struct amdgpu_device *adev, struct amdgpu_vm *vm,

		     struct drm_sched_entity *entity, void *owner,

		     unsigned int num_ibs, struct amdgpu_job **job)

{

	if (num_ibs == 0)

		return -EINVAL;
@@ -111,23 +112,30 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, 
	(*job)->vram_lost_counter = atomic_read(&adev->vram_lost_counter);

	(*job)->vm_pd_addr = AMDGPU_BO_INVALID_OFFSET;



	if (!entity)

		return 0;



	return drm_sched_job_init(&(*job)->base, entity, owner);

}



int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size,

		enum amdgpu_ib_pool_type pool_type,

int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev,

			     struct drm_sched_entity *entity, void *owner,

			     size_t size, enum amdgpu_ib_pool_type pool_type,

			     struct amdgpu_job **job)

{

	int r;



	r = amdgpu_job_alloc(adev, 1, job, NULL);

	r = amdgpu_job_alloc(adev, NULL, entity, owner, 1, job);

	if (r)

		return r;



	(*job)->num_ibs = 1;

	r = amdgpu_ib_get(adev, NULL, size, pool_type, &(*job)->ibs[0]);

	if (r)

	if (r) {

		if (entity)

			drm_sched_job_cleanup(&(*job)->base);

		kfree(*job);

	}



	return r;

}
@@ -191,6 +199,9 @@ void amdgpu_job_set_gang_leader(struct amdgpu_job *job, 


void amdgpu_job_free(struct amdgpu_job *job)

{

	if (job->base.entity)

		drm_sched_job_cleanup(&job->base);



	amdgpu_job_free_resources(job);

	amdgpu_sync_free(&job->sync);

	amdgpu_sync_free(&job->sched_sync);
@@ -203,25 +214,16 @@ void amdgpu_job_free(struct amdgpu_job *job) 
		dma_fence_put(&job->hw_fence);

}



int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity,

		      void *owner, struct dma_fence **f)

struct dma_fence *amdgpu_job_submit(struct amdgpu_job *job)

{

	int r;



	if (!f)

		return -EINVAL;



	r = drm_sched_job_init(&job->base, entity, owner);

	if (r)

		return r;

	struct dma_fence *f;



	drm_sched_job_arm(&job->base);



	*f = dma_fence_get(&job->base.s_fence->finished);

	f = dma_fence_get(&job->base.s_fence->finished);

	amdgpu_job_free_resources(job);

	drm_sched_entity_push_job(&job->base);



	return 0;

	return f;

}



int amdgpu_job_submit_direct(struct amdgpu_job *job, struct amdgpu_ring *ring,

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

+8 −6
Original line number Diff line number Diff line
@@ -78,18 +78,20 @@ static inline struct amdgpu_ring *amdgpu_job_ring(struct amdgpu_job *job) 
	return to_amdgpu_ring(job->base.entity->rq->sched);

}



int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,

		     struct amdgpu_job **job, struct amdgpu_vm *vm);

int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size,

		enum amdgpu_ib_pool_type pool, struct amdgpu_job **job);

int amdgpu_job_alloc(struct amdgpu_device *adev, struct amdgpu_vm *vm,

		     struct drm_sched_entity *entity, void *owner,

		     unsigned int num_ibs, struct amdgpu_job **job);

int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev,

			     struct drm_sched_entity *entity, void *owner,

			     size_t size, enum amdgpu_ib_pool_type pool_type,

			     struct amdgpu_job **job);

void amdgpu_job_set_resources(struct amdgpu_job *job, struct amdgpu_bo *gds,

			      struct amdgpu_bo *gws, struct amdgpu_bo *oa);

void amdgpu_job_free_resources(struct amdgpu_job *job);

void amdgpu_job_set_gang_leader(struct amdgpu_job *job,

				struct amdgpu_job *leader);

void amdgpu_job_free(struct amdgpu_job *job);

int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity,

		      void *owner, struct dma_fence **f);

struct dma_fence *amdgpu_job_submit(struct amdgpu_job *job);

int amdgpu_job_submit_direct(struct amdgpu_job *job, struct amdgpu_ring *ring,

			     struct dma_fence **fence);

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

+4 −3
Original line number Diff line number Diff line
@@ -150,14 +150,15 @@ static int amdgpu_jpeg_dec_set_reg(struct amdgpu_ring *ring, uint32_t handle, 
	const unsigned ib_size_dw = 16;

	int i, r;



	r = amdgpu_job_alloc_with_ib(ring->adev, ib_size_dw * 4,

	r = amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4,

				     AMDGPU_IB_POOL_DIRECT, &job);

	if (r)

		return r;



	ib = &job->ibs[0];



	ib->ptr[0] = PACKETJ(adev->jpeg.internal.jpeg_pitch, 0, 0, PACKETJ_TYPE0);

	ib->ptr[0] = PACKETJ(adev->jpeg.internal.jpeg_pitch, 0, 0,

			     PACKETJ_TYPE0);

	ib->ptr[1] = 0xDEADBEEF;

	for (i = 2; i < 16; i += 2) {

		ib->ptr[i] = PACKETJ(0, 0, 0, PACKETJ_TYPE6);