drm/amdgpu: clean up and unify hw fence handling
Subsystems (2)
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: clean up and unify hw fence handling
Decouple the amdgpu fence from the amdgpu_job structure. This lets us clean up the separate fence ops for the embedded fence and other fences. This also allows us to allocate the vm fence up front when we allocate the job.
v2: Additional cleanup suggested by Christian
v3: Additional cleaups suggested by Christian
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 149 +++----------------- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 21 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 41 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +- 8 files changed, 68 insertions(+), 170 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1 -1
@@ -1902,7 +1902,7 @@ static void amdgpu_ib_preempt_mark_partial_job(struct amdgpu_ring *ring)continue ; } job =to_amdgpu_job (s_job); -if (preempted && (&job->hw_fence.base) == fence) +if (preempted && (&job->hw_fence->base) == fence)/* mark the job as preempted */ job->preemption_status |=AMDGPU_IB_PREEMPTED ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -6
@@ -5798,11 +5798,6 @@ int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev,if (!amdgpu_ring_sched_ready (ring))continue ; -/* Clear job fence from fence drv to avoid force_completion -* leave NULL and vm flush fence in fence drv -*/ -amdgpu_fence_driver_clear_job_fences (ring); -/* after all hw jobs are reset, hw fence is meaningless, so force_completion */ amdgpu_fence_driver_force_completion (ring); }
@@ -6526,7 +6521,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,* * job->base holds a reference to parent fence */ -if (job &&dma_fence_is_signaled (&job->hw_fence.base)) { +if (job &&dma_fence_is_signaled (&job->hw_fence->base)) { job_signaled = true;dev_info (adev->dev,"Guilty job already signaled, skipping HW reset" ); goto skip_hw_reset;
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +16 -133
237 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +14 -7
@@ -128,7 +128,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned int num_ibs,struct amdgpu_device *adev = ring->adev;struct amdgpu_ib *ib = &ibs[0 ];struct dma_fence *tmp =NULL ; -struct amdgpu_fence *af; +struct amdgpu_fence *af, *vm_af;bool need_ctx_switch;struct amdgpu_vm *vm;uint64_t fence_ctx;
@@ -149,17 +149,20 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned int num_ibs,if (job) { vm = job->vm; fence_ctx = job->base.s_fence ? - job->base.s_fence->scheduled.context :0 ; + job->base.s_fence->finished.context :0 ; shadow_va = job->shadow_va; csa_va = job->csa_va; gds_va = job->gds_va; init_shadow = job->init_shadow; - af = &job->hw_fence; + af = job->hw_fence;/* Save the context of the job for reset handling. * The driver needs this so it can skip the ring * contents for guilty contexts. */ - af->context = job->base.s_fence ? job->base.s_fence->finished.context :0 ; + af->context = fence_ctx; + vm_af = job->hw_vm_fence; +/* the vm fence is also part of the job's context */ + vm_af->context = fence_ctx; }else { vm =NULL ; fence_ctx =0 ;
@@ -167,7 +170,10 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned int num_ibs, csa_va =0 ; gds_va =0 ; init_shadow = false; - af =NULL ; + af =kzalloc (sizeof (*af),GFP_ATOMIC ); +if (!af) +return -ENOMEM ; + vm_af =NULL ; }if (!ring->sched.ready) {
@@ -289,7 +295,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned int num_ibs,amdgpu_ring_init_cond_exec (ring, ring->cond_exe_gpu_addr); } - r =amdgpu_fence_emit (ring, f, af, fence_flags); + r =amdgpu_fence_emit (ring, af, fence_flags);if (r) {dev_err (adev->dev,"failed to emit fence (%d)\n" , r);if (job && job->vmid)
@@ -297,6 +303,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned int num_ibs,amdgpu_ring_undo (ring);return r; } + *f = &af->base;if (ring->funcs->insert_end) ring->funcs->insert_end (ring);
@@ -317,7 +324,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned int num_ibs,* fence so we know what rings contents to backup * after we reset the queue. */ -amdgpu_fence_save_wptr (*f); +amdgpu_fence_save_wptr (af);amdgpu_ring_ib_end (ring);amdgpu_ring_commit (ring);
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +29 -12
83 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_job.h +2 -1
@@ -48,7 +48,8 @@ struct amdgpu_job {struct drm_sched_job base;struct amdgpu_vm *vm;struct amdgpu_sync explicit_sync; -struct amdgpu_fence hw_fence; +struct amdgpu_fence *hw_fence; +struct amdgpu_fence *hw_vm_fence;struct dma_fence *gang_submit;uint32_t preamble_status;uint32_t preemption_status;
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +3 -5
@@ -147,16 +147,14 @@ struct amdgpu_fence {u64 wptr;/* fence context for resets */ u64 context; -uint32_t seq; };extern const struct drm_sched_backend_ops amdgpu_sched_ops; -void amdgpu_fence_driver_clear_job_fences (struct amdgpu_ring *ring);void amdgpu_fence_driver_set_error (struct amdgpu_ring *ring,int error);void amdgpu_fence_driver_force_completion (struct amdgpu_ring *ring);void amdgpu_fence_driver_guilty_force_completion (struct amdgpu_fence *fence); -void amdgpu_fence_save_wptr (struct dma_fence *fence); +void amdgpu_fence_save_wptr (struct amdgpu_fence *af);int amdgpu_fence_driver_init_ring (struct amdgpu_ring *ring); int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,
@@ -166,8 +164,8 @@ void amdgpu_fence_driver_hw_init(struct amdgpu_device *adev);void amdgpu_fence_driver_hw_fini (struct amdgpu_device *adev);int amdgpu_fence_driver_sw_init (struct amdgpu_device *adev);void amdgpu_fence_driver_sw_fini (struct amdgpu_device *adev); -int amdgpu_fence_emit (struct amdgpu_ring *ring,struct dma_fence **f, -struct amdgpu_fence *af,unsigned int flags); +int amdgpu_fence_emit (struct amdgpu_ring *ring,struct amdgpu_fence *af, +unsigned int flags);int amdgpu_fence_emit_polling (struct amdgpu_ring *ring,uint32_t *s,uint32_t timeout);bool amdgpu_fence_process (struct amdgpu_ring *ring);
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -5
@@ -772,7 +772,6 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job,bool cleaner_shader_needed = false;bool pasid_mapping_needed = false;struct dma_fence *fence =NULL ; -struct amdgpu_fence *af;unsigned int patch;int r;
@@ -835,13 +834,11 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, }if (vm_flush_needed || pasid_mapping_needed || cleaner_shader_needed) { - r =amdgpu_fence_emit (ring, &fence,NULL ,0 ); + r =amdgpu_fence_emit (ring, job->hw_vm_fence,0 );if (r)return r; -/* this is part of the job's context */ - af = container_of(fence, struct amdgpu_fence, base); - af->context = job->base.s_fence ? job->base.s_fence->finished.context :0 ; } + fence = &job->hw_vm_fence->base;if (vm_flush_needed) {mutex_lock (&id_mgr->lock);
Signature · 1 line
2.51.0