Commit 50ddc75e authored by Junwei Zhang's avatar Junwei Zhang Committed by Alex Deucher
Browse files

drm/amd/amdgpu: remove the uncessary parameter for ib scheduler 



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

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

+2 −2
Original line number Diff line number Diff line
@@ -906,8 +906,8 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib,

		    struct dma_fence *f);

int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,

		       struct amdgpu_ib *ib, struct dma_fence *last_vm_update,

		       struct amdgpu_job *job, struct dma_fence **f);

		       struct amdgpu_ib *ibs, struct amdgpu_job *job,

		       struct dma_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

+2 −2
Original line number Diff line number Diff line
@@ -116,8 +116,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, struct dma_fence *last_vm_update,

		       struct amdgpu_job *job, struct dma_fence **f)

		       struct amdgpu_ib *ibs, struct amdgpu_job *job,

		       struct dma_fence **f)

{

	struct amdgpu_device *adev = ring->adev;

	struct amdgpu_ib *ib = &ibs[0];

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

+1 −2
Original line number Diff line number Diff line
@@ -170,8 +170,7 @@ static struct dma_fence *amdgpu_job_run(struct amd_sched_job *sched_job) 
	BUG_ON(amdgpu_sync_peek_fence(&job->sync, NULL));



	trace_amdgpu_sched_run_job(job);

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

			       job->sync.last_vm_update, job, &fence);

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

	if (r)

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

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

+1 −1
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, 
	WARN_ON(job->ibs[0].length_dw > num_dw);

	if (direct_submit) {

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

				       NULL, NULL, fence);

				       NULL, fence);

		job->fence = dma_fence_get(*fence);

		if (r)

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

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

+1 −1
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo, 
	ib->length_dw = 16;



	if (direct) {

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

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

		job->fence = dma_fence_get(f);

		if (r)

			goto err_free;

CRA Git | Maintained and supported by SUSTech CRA and CCSE