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

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

drm/amdgpu: add amdgpu_job_submit_direct helper 



Make sure that we properly initialize at least the sched member.

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

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

+15 −0
Original line number Diff line number Diff line
@@ -140,6 +140,21 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity, 
	return 0;

}



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

			     struct dma_fence **fence)

{

	int r;



	job->base.sched = &ring->sched;

	r = amdgpu_ib_schedule(ring, job->num_ibs, job->ibs, NULL, fence);

	job->fence = dma_fence_get(*fence);

	if (r)

		return r;



	amdgpu_job_free(job);

	return 0;

}



static struct dma_fence *amdgpu_job_dependency(struct drm_sched_job *sched_job,

					       struct drm_sched_entity *s_entity)

{

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

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#define to_amdgpu_job(sched_job)		\

		container_of((sched_job), struct amdgpu_job, base)



struct amdgpu_fence;



struct amdgpu_job {

	struct drm_sched_job    base;

	struct amdgpu_device	*adev;
@@ -68,4 +70,6 @@ void amdgpu_job_free_resources(struct amdgpu_job *job); 
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);

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

			     struct dma_fence **fence);

#endif

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

+6 −11
Original line number Diff line number Diff line
@@ -2075,24 +2075,19 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, 


	amdgpu_ring_pad_ib(ring, &job->ibs[0]);

	WARN_ON(job->ibs[0].length_dw > num_dw);

	if (direct_submit) {

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

				       NULL, fence);

		job->fence = dma_fence_get(*fence);

		if (r)

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

		amdgpu_job_free(job);

	} else {

	if (direct_submit)

		r = amdgpu_job_submit_direct(job, ring, fence);

	else

		r = amdgpu_job_submit(job, &adev->mman.entity,

				      AMDGPU_FENCE_OWNER_UNDEFINED, fence);

	if (r)

		goto error_free;

	}



	return r;



error_free:

	amdgpu_job_free(job);

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

	return r;

}

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

+1 −4
Original line number Diff line number Diff line
@@ -1062,12 +1062,9 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, 
		if (r < 0)

			goto err_free;



		r = amdgpu_ib_schedule(ring, 1, ib, NULL, &f);

		job->fence = dma_fence_get(f);

		r = amdgpu_job_submit_direct(job, ring, &f);

		if (r)

			goto err_free;



		amdgpu_job_free(job);

	} else {

		r = amdgpu_sync_resv(adev, &job->sync, bo->tbo.resv,

				     AMDGPU_FENCE_OWNER_UNDEFINED, false);

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

+6 −14
Original line number Diff line number Diff line
@@ -469,12 +469,10 @@ int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, 
	for (i = ib->length_dw; i < ib_size_dw; ++i)

		ib->ptr[i] = 0x0;



	r = amdgpu_ib_schedule(ring, 1, ib, NULL, &f);

	job->fence = dma_fence_get(f);

	r = amdgpu_job_submit_direct(job, ring, &f);

	if (r)

		goto err;



	amdgpu_job_free(job);

	if (fence)

		*fence = dma_fence_get(f);

	dma_fence_put(f);
@@ -531,19 +529,13 @@ int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, 
	for (i = ib->length_dw; i < ib_size_dw; ++i)

		ib->ptr[i] = 0x0;



	if (direct) {

		r = amdgpu_ib_schedule(ring, 1, ib, NULL, &f);

		job->fence = dma_fence_get(f);

		if (r)

			goto err;



		amdgpu_job_free(job);

	} else {

	if (direct)

		r = amdgpu_job_submit_direct(job, ring, &f);

	else

		r = amdgpu_job_submit(job, &ring->adev->vce.entity,

				      AMDGPU_FENCE_OWNER_UNDEFINED, &f);

	if (r)

		goto err;

	}



	if (fence)

		*fence = dma_fence_get(f);