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

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

drm/amdgpu: remove ring parameter from amdgpu_job_submit 



We know the ring through the entity anyway.

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 eb3961a5

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

+4 −5
Original line number Diff line number Diff line
@@ -117,21 +117,20 @@ void amdgpu_job_free(struct amdgpu_job *job) 
	kfree(job);

}



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

		      struct drm_sched_entity *entity, void *owner,

		      struct dma_fence **f)

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

		      void *owner, struct dma_fence **f)

{

	int r;

	job->ring = ring;



	if (!f)

		return -EINVAL;



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

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

	if (r)

		return r;



	job->owner = owner;

	job->ring = to_amdgpu_ring(entity->sched);

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

	amdgpu_job_free_resources(job);

	amdgpu_ring_priority_get(job->ring, job->base.s_priority);

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

+2 −3
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size, 


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 amdgpu_ring *ring,

		      struct drm_sched_entity *entity, void *owner,

		      struct dma_fence **f);

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

		      void *owner, struct dma_fence **f);

#endif

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

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#define AMDGPU_FENCE_FLAG_INT           (1 << 1)

#define AMDGPU_FENCE_FLAG_TC_WB_ONLY    (1 << 2)



#define to_amdgpu_ring(s) container_of((s), struct amdgpu_ring, sched)



enum amdgpu_ring_type {

	AMDGPU_RING_TYPE_GFX,

	AMDGPU_RING_TYPE_COMPUTE,

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

+3 −3
Original line number Diff line number Diff line
@@ -2006,7 +2006,7 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo, 
	if (r)

		goto error_free;



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

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

			      AMDGPU_FENCE_OWNER_UNDEFINED, &fence);

	if (r)

		goto error_free;
@@ -2083,7 +2083,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, 
			DRM_ERROR("Error scheduling IBs (%d)\n", r);

		amdgpu_job_free(job);

	} else {

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

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

				      AMDGPU_FENCE_OWNER_UNDEFINED, fence);

		if (r)

			goto error_free;
@@ -2175,7 +2175,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, 


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

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

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

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

			      AMDGPU_FENCE_OWNER_UNDEFINED, fence);

	if (r)

		goto error_free;

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

+1 −1
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, 
		if (r)

			goto err_free;



		r = amdgpu_job_submit(job, ring, &adev->uvd.inst[ring->me].entity,

		r = amdgpu_job_submit(job, &adev->uvd.inst[ring->me].entity,

				      AMDGPU_FENCE_OWNER_UNDEFINED, &f);

		if (r)

			goto err_free;