drm/amd/amdgpu: remove the uncessary parameter for ib scheduler
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: remove the uncessary parameter for ib scheduler
Change-Id Ic32eb032eacb5eaa08ba23a83e834472774fb5c3
Signed-off-by Junwei Zhang <[email protected]>
--- 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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -2
@@ -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);
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +2 -2
@@ -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 ];
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +1 -2
@@ -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);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -1
@@ -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);
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1 -1
@@ -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;
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2 -2
@@ -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;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +1 -1
@@ -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;
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
@@ -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;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1 -1
@@ -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;
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2 -2
@@ -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;
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +1 -1
@@ -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;
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +1 -1
@@ -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;
drivers/gpu/drm/amd/amdgpu/si_dma.c +1 -1
@@ -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;
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1485160670-27553-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org
Am 23.01.2017 um 09:37 schrieb Junwei Zhang:
Quoted 2 lines
Change-Id Ic32eb032eacb5eaa08ba23a83e834472774fb5c3Signed-off-by Junwei Zhang <[email protected]>
Oh, yeah good catch. That was removed quite a while ago.
Patch is Reviewed-by: Christian König <[email protected]>.
Quoted 200 lines
--- 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(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +2
-2@@ -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);drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +2
-2@@ -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 ];drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +1
-2@@ -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);drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-1@@ -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);drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1
-1@@ -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;drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2
-2@@ -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;drivers/gpu/drm/amd/amdgpu/cik_sdma.c +1
-1@@ -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;drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1
-1@@ -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;drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1
-1@@ -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;drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2
-2@@ -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;drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +1
-1@@ -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;drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +1
-1@@ -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;drivers/gpu/drm/amd/amdgpu/si_dma.c +0
-0
drivers/gpu/drm/amd/amdgpu/si_dma.c static int si_dma_ring_test_ib(struct amdgpu_ring *ring, long timeout) · line 307
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/si_dma.c +1
-1@@ -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;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx