drm/amdgpu: add sched sync for amdgpu job v2
Subsystems (2)
PATCH 1/3 drm/amdgpu: add sched sync for amdgpu job v2
this is an improvement for previous patch, the sched_sync is to store fence that could be skipped as scheduled, when job is executed, we didn't need pipeline_sync if all fences in sched_sync are signalled, otherwise insert pipeline_sync still.
v2: handle error when adding fence to sync failed.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 7 ++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 13 +++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1162,6 +1162,7 @@ struct amdgpu_job {struct amdgpu_vm *vm;struct amdgpu_ring *ring;struct amdgpu_sync sync; +struct amdgpu_sync sched_sync;struct amdgpu_ib *ibs;struct fence *fence;/* the hw fence */ uint32_t preamble_status;
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +6 -1
@@ -121,6 +121,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, {struct amdgpu_device *adev = ring->adev;struct amdgpu_ib *ib = &ibs[0 ]; +struct fence *tmp;bool skip_preamble, need_ctx_switch;unsigned patch_offset = ~0 ;struct amdgpu_vm *vm;
@@ -167,8 +168,12 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,return r; } -if (ring->funcs->emit_pipeline_sync && job && job->need_pipeline_sync) +if (ring->funcs->emit_pipeline_sync && job && + (tmp =amdgpu_sync_get_fence (&job->sched_sync))) { + job->need_pipeline_sync = true;amdgpu_ring_emit_pipeline_sync (ring); +fence_put (tmp); + }if (vm) {amdgpu_ring_insert_nop (ring, extra_nop);/* prevent CE go too fast than DE */
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +9 -4
@@ -60,6 +60,7 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, (*job)->need_pipeline_sync = false;amdgpu_sync_create (&(*job)->sync); +amdgpu_sync_create (&(*job)->sched_sync);return 0 ; }
@@ -98,6 +99,7 @@ static void amdgpu_job_free_cb(struct amd_sched_job *s_job)fence_put (job->fence);amdgpu_sync_free (&job->sync); +amdgpu_sync_free (&job->sched_sync);kfree (job); }
@@ -107,6 +109,7 @@ void amdgpu_job_free(struct amdgpu_job *job)fence_put (job->fence);amdgpu_sync_free (&job->sync); +amdgpu_sync_free (&job->sched_sync);kfree (job); }
@@ -139,10 +142,10 @@ static struct fence *amdgpu_job_dependency(struct amd_sched_job *sched_job)struct amdgpu_vm *vm = job->vm;struct fence *fence =amdgpu_sync_get_fence (&job->sync); +int r;while (fence ==NULL && vm && !job->vm_id) {struct amdgpu_ring *ring = job->ring; -int r; r = amdgpu_vm_grab_id(vm, ring, &job->sync, &job->base.s_fence->finished,
@@ -153,9 +156,11 @@ static struct fence *amdgpu_job_dependency(struct amd_sched_job *sched_job) fence =amdgpu_sync_get_fence (&job->sync); } -if (amd_sched_dependency_optimized (fence, sched_job->s_entity)) - job->need_pipeline_sync = true; - +if (amd_sched_dependency_optimized (fence, sched_job->s_entity)) { + r =amdgpu_sync_fence (job->adev, &job->sched_sync, fence); +if (r) +DRM_ERROR ("Error adding fence to sync (%d)\n" , r); + }return fence; }
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): 1494409360-8455-1-git-send-email-David1.Zhou-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 drm/amdgpu: make pipeline sync be in same place v2
v2: direclty return for 'if' case.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 32 +++++++++++++++++++++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 ++ 5 files changed, 34 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
@@ -1170,7 +1170,6 @@ struct amdgpu_job {void *owner;uint64_t fence_ctx;/* the fence_context this job uses */ bool vm_needs_flush; -bool need_pipeline_sync;unsigned vm_id;uint64_t vm_pd_addr;uint32_t gds_base, gds_size;
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3 -3
@@ -121,7 +121,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, {struct amdgpu_device *adev = ring->adev;struct amdgpu_ib *ib = &ibs[0 ]; -struct fence *tmp; +struct fence *tmp =NULL ;bool skip_preamble, need_ctx_switch;unsigned patch_offset = ~0 ;struct amdgpu_vm *vm;
@@ -169,8 +169,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, }if (ring->funcs->emit_pipeline_sync && job && - (tmp =amdgpu_sync_get_fence (&job->sched_sync))) { - job->need_pipeline_sync = true; + ((tmp =amdgpu_sync_get_fence (&job->sched_sync)) || +amdgpu_vm_need_pipeline_sync (ring, job))) {amdgpu_ring_emit_pipeline_sync (ring);fence_put (tmp); }
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +0 -1
@@ -57,7 +57,6 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, (*job)->vm = vm; (*job)->ibs = (void *)&(*job)[1 ]; (*job)->num_ibs = num_ibs; - (*job)->need_pipeline_sync = false;amdgpu_sync_create (&(*job)->sync);amdgpu_sync_create (&(*job)->sched_sync);
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +29 -3
@@ -700,6 +700,35 @@ static u64 amdgpu_vm_adjust_mc_addr(struct amdgpu_device *adev, u64 mc_addr)return addr; } +bool amdgpu_vm_need_pipeline_sync (struct amdgpu_ring *ring, +struct amdgpu_job *job) +{ +struct amdgpu_device *adev = ring->adev; +unsigned vmhub = ring->funcs->vmhub; +struct amdgpu_vm_id_manager *id_mgr = &adev->vm_manager.id_mgr[vmhub]; +struct amdgpu_vm_id *id; +bool gds_switch_needed; +bool vm_flush_needed = job->vm_needs_flush || +amdgpu_vm_ring_has_compute_vm_bug (ring); + +if (job->vm_id ==0 ) +return false; + id = &id_mgr->ids[job->vm_id]; + gds_switch_needed = ring->funcs->emit_gds_switch && ( + id->gds_base != job->gds_base || + id->gds_size != job->gds_size || + id->gws_base != job->gws_base || + id->gws_size != job->gws_size || + id->oa_base != job->oa_base || + id->oa_size != job->oa_size); + +if (amdgpu_vm_had_gpu_reset (adev, id)) +return true; +if (!vm_flush_needed && !gds_switch_needed) +return false; +return true; +} +/** * amdgpu_vm_flush - hardware flush the vm *
@@ -738,9 +767,6 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)if (ring->funcs->init_cond_exec) patch_offset =amdgpu_ring_init_cond_exec (ring); -if (ring->funcs->emit_pipeline_sync && !job->need_pipeline_sync) -amdgpu_ring_emit_pipeline_sync (ring); -if (ring->funcs->emit_vm_flush && vm_flush_needed) {u64 pd_addr =amdgpu_vm_adjust_mc_addr (adev, job->vm_pd_addr);struct fence *fence;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -0
@@ -254,5 +254,7 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va);void amdgpu_vm_adjust_size (struct amdgpu_device *adev,uint64_t vm_size);int amdgpu_vm_ioctl (struct drm_device *dev,void *data,struct drm_file *filp); +bool amdgpu_vm_need_pipeline_sync (struct amdgpu_ring *ring, +struct amdgpu_job *job);#endif
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu: id reset count only is updated when used end v2
In reply to a message not in the archivebefore that, we have function to check if reset happens by using reset count.
v2: always update reset count after vm flush
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -2
@@ -450,7 +450,6 @@ static int amdgpu_vm_grab_reserved_vmid_locked(struct amdgpu_vm *vm, id->flushed_updates =fence_get (updates); } id->pd_gpu_addr = job->vm_pd_addr; - id->current_gpu_reset_count =atomic_read (&adev->gpu_reset_counter);atomic64_set (&id->owner, vm->client_id); job->vm_needs_flush = needs_flush;if (needs_flush) {
@@ -598,7 +597,6 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, id->pd_gpu_addr = job->vm_pd_addr;fence_put (id->flushed_updates); id->flushed_updates =fence_get (updates); - id->current_gpu_reset_count =atomic_read (&adev->gpu_reset_counter);atomic64_set (&id->owner, vm->client_id); needs_flush:
@@ -781,6 +779,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job)mutex_lock (&id_mgr->lock);fence_put (id->last_flush); id->last_flush = fence; + id->current_gpu_reset_count =atomic_read (&adev->gpu_reset_counter);mutex_unlock (&id_mgr->lock); }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Reviewed-byAm 10.05.2017 um 11:42 schrieb Chunming Zhou:
Quoted 9 lines
this is an improvement for previous patch, the
sched_syncis to store fence that could be skipped as scheduled, when job is executed, we didn't needpipeline_syncif all fences insched_syncare signalled, otherwise insertpipeline_syncstill.v2: handle error when adding fence to sync failed.
Change-Id I26d3a2794272ba94b25753d4bf367326d12f6939Signed-off-by Chunming Zhou <[email protected]>
Quoted 89 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 7 ++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 13 +++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1162,6 +1162,7 @@ struct amdgpu_job {struct amdgpu_vm *vm;struct amdgpu_ring *ring;struct amdgpu_sync sync; +struct amdgpu_sync sched_sync;struct amdgpu_ib *ibs;struct fence *fence;/* the hw fence */ uint32_t preamble_status;drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +6
-1@@ -121,6 +121,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, {struct amdgpu_device *adev = ring->adev;struct amdgpu_ib *ib = &ibs[0 ]; +struct fence *tmp;bool skip_preamble, need_ctx_switch;unsigned patch_offset = ~0 ;struct amdgpu_vm *vm;@@ -167,8 +168,12 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,return r; } -if (ring->funcs->emit_pipeline_sync && job && job->need_pipeline_sync) +if (ring->funcs->emit_pipeline_sync && job && + (tmp =amdgpu_sync_get_fence (&job->sched_sync))) { + job->need_pipeline_sync = true;amdgpu_ring_emit_pipeline_sync (ring); +fence_put (tmp); + }if (vm) {amdgpu_ring_insert_nop (ring, extra_nop);/* prevent CE go too fast than DE */ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +4
-2@@ -60,6 +60,7 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, (*job)->need_pipeline_sync = false;amdgpu_sync_create (&(*job)->sync); +amdgpu_sync_create (&(*job)->sched_sync);return 0 ; }@@ -98,6 +99,7 @@ static void amdgpu_job_free_cb(struct amd_sched_job *s_job)fence_put (job->fence);amdgpu_sync_free (&job->sync); +amdgpu_sync_free (&job->sched_sync);kfree (job); }@@ -107,6 +109,7 @@ void amdgpu_job_free(struct amdgpu_job *job)fence_put (job->fence);amdgpu_sync_free (&job->sync); +amdgpu_sync_free (&job->sched_sync);kfree (job); }@@ -139,10 +142,10 @@ static struct fence *amdgpu_job_dependency(struct amd_sched_job *sched_job)struct amdgpu_vm *vm = job->vm;struct fence *fence =amdgpu_sync_get_fence (&job->sync); +int r;while (fence ==NULL && vm && !job->vm_id) {struct amdgpu_ring *ring = job->ring; -int r; r = amdgpu_vm_grab_id(vm, ring, &job->sync, &job->base.s_fence->finished,@@ -153,9 +156,11 @@ static struct fence *amdgpu_job_dependency(struct amd_sched_job *sched_job) fence =amdgpu_sync_get_fence (&job->sync); } -if (amd_sched_dependency_optimized (fence, sched_job->s_entity))
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c static struct fence *amdgpu_job_dependency(struct amd_sched_job *sched_job) · line 166
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +5
-2- job->need_pipeline_sync = true; - +if (amd_sched_dependency_optimized (fence, sched_job->s_entity)) { + r =amdgpu_sync_fence (job->adev, &job->sched_sync, fence); +if (r) +DRM_ERROR ("Error adding fence to sync (%d)\n" , r); + }return fence; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx