Am 23.01.2017 um 09:37 schrieb Junwei Zhang:
> Change-Id: Ic32eb032eacb5eaa08ba23a83e834472774fb5c3
> Signed-off-by: Junwei Zhang <Jerry.Zhang at amd.com>
Oh, yeah good catch. That was removed quite a while ago.
Patch is Reviewed-by: Christian König <christian.koenig at amd.com>.
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 +-
> 13 files changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index d0d2bef..ba366cf 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -915,8 +915,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 fence *f);
> int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
> - struct amdgpu_ib *ib, struct fence *last_vm_update,
> - struct amdgpu_job *job, struct fence **f);
> + struct amdgpu_ib *ibs, struct amdgpu_job *job,
> + 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);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> index 16308eb..f486bf6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> @@ -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 fence *last_vm_update,
> - struct amdgpu_job *job, struct fence **f)
> + struct amdgpu_ib *ibs, struct amdgpu_job *job,
> + struct fence **f)
> {
> struct amdgpu_device *adev = ring->adev;
> struct amdgpu_ib *ib = &ibs[0];
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> index 8c58079..37d3f31 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> @@ -170,8 +170,7 @@ static struct 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);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 80e1ee7..a12acef 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1494,7 +1494,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 = fence_get(*fence);
> if (r)
> DRM_ERROR("Error scheduling IBs (%d)\n", r);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> index a560b4f..ed73015 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> @@ -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 = fence_get(f);
> if (r)
> goto err_free;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> index 6ba67cb..36b5fff 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> @@ -455,7 +455,7 @@ 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, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, ib, NULL, &f);
> job->fence = fence_get(f);
> if (r)
> goto err;
> @@ -518,7 +518,7 @@ int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,
> ib->ptr[i] = 0x0;
>
> if (direct) {
> - r = amdgpu_ib_schedule(ring, 1, ib, NULL, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, ib, NULL, &f);
> job->fence = fence_get(f);
> if (r)
> goto err;
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> index c7340b6..6bc24c4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> @@ -651,7 +651,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> ib.ptr[3] = 1;
> ib.ptr[4] = 0xDEADBEEF;
> ib.length_dw = 5;
> - r = amdgpu_ib_schedule(ring, 1, &ib, NULL, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, &ib, NULL, &f);
> if (r)
> goto err1;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> index 4a633a3..6333b20 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> @@ -1975,7 +1975,7 @@ static int gfx_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> ib.ptr[2] = 0xDEADBEEF;
> ib.length_dw = 3;
>
> - r = amdgpu_ib_schedule(ring, 1, &ib, NULL, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, &ib, NULL, &f);
> if (r)
> goto err2;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> index aaf66fe..825aa0c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> @@ -2339,7 +2339,7 @@ static int gfx_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> ib.ptr[2] = 0xDEADBEEF;
> ib.length_dw = 3;
>
> - r = amdgpu_ib_schedule(ring, 1, &ib, NULL, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, &ib, NULL, &f);
> if (r)
> goto err2;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 99dd9e9..9b51dfe 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -829,7 +829,7 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> ib.ptr[2] = 0xDEADBEEF;
> ib.length_dw = 3;
>
> - r = amdgpu_ib_schedule(ring, 1, &ib, NULL, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, &ib, NULL, &f);
> if (r)
> goto err2;
>
> @@ -1776,7 +1776,7 @@ static int gfx_v8_0_do_edc_gpr_workarounds(struct amdgpu_device *adev)
> ib.ptr[ib.length_dw++] = EVENT_TYPE(7) | EVENT_INDEX(4);
>
> /* shedule the ib on the ring */
> - r = amdgpu_ib_schedule(ring, 1, &ib, NULL, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, &ib, NULL, &f);
> if (r) {
> DRM_ERROR("amdgpu: ib submit failed (%d).\n", r);
> goto fail;
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index e35df3d..d98dd89 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -701,7 +701,7 @@ static int sdma_v2_4_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> ib.ptr[7] = SDMA_PKT_HEADER_OP(SDMA_OP_NOP);
> ib.length_dw = 8;
>
> - r = amdgpu_ib_schedule(ring, 1, &ib, NULL, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, &ib, NULL, &f);
> if (r)
> goto err1;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index efcdf82..25602c4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -910,7 +910,7 @@ static int sdma_v3_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> ib.ptr[7] = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP);
> ib.length_dw = 8;
>
> - r = amdgpu_ib_schedule(ring, 1, &ib, NULL, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, &ib, NULL, &f);
> if (r)
> goto err1;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
> index 14265c5..c6fa3b8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c
> @@ -301,7 +301,7 @@ static int si_dma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
> ib.ptr[2] = upper_32_bits(gpu_addr) & 0xff;
> ib.ptr[3] = 0xDEADBEEF;
> ib.length_dw = 4;
> - r = amdgpu_ib_schedule(ring, 1, &ib, NULL, NULL, &f);
> + r = amdgpu_ib_schedule(ring, 1, &ib, NULL, &f);
> if (r)
> goto err1;
>
