drm/amdgpu: fix preamble handling
Subsystems (2)
PATCH 1/6 drm/amdgpu: fix preamble handling
At this point the command submission can still be interrupted.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +9 -7
@@ -1015,13 +1015,9 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,if (r)return r; -if (chunk_ib->flags &AMDGPU_IB_FLAG_PREAMBLE ) { - parser->job->preamble_status |=AMDGPU_PREAMBLE_IB_PRESENT ; -if (!parser->ctx->preamble_presented) { - parser->job->preamble_status |=AMDGPU_PREAMBLE_IB_PRESENT_FIRST ; - parser->ctx->preamble_presented = true; - } - } +if (chunk_ib->flags &AMDGPU_IB_FLAG_PREAMBLE ) + parser->job->preamble_status |= +AMDGPU_PREAMBLE_IB_PRESENT ;if (parser->entity && parser->entity != entity)return -EINVAL ;
@@ -1244,6 +1240,12 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,amdgpu_cs_post_dependencies (p); +if ((job->preamble_status &AMDGPU_PREAMBLE_IB_PRESENT ) && + !p->ctx->preamble_presented) { + job->preamble_status |=AMDGPU_PREAMBLE_IB_PRESENT_FIRST ; + p->ctx->preamble_presented = true; + } + cs->out.handle = seq; job->uf_sequence = seq;
Signature · 6 lines
2.14.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): 20180822100457.52546-1-christian.koenig-5C7GfCeVMHo@public.gmane.org
PATCH 2/6 drm/amdgpu: cleanup GPU recovery check a bit
Check if we should call the function instead of providing the forced flag.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 38 ++++++++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 ++- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 3 ++- 7 files changed, 36 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -1
@@ -1158,8 +1158,9 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_asic_need_full_reset (adev) (adev)->asic_funcs->need_full_reset((adev))/* Common functions */ +bool amdgpu_device_should_recover_gpu (struct amdgpu_device *adev);int amdgpu_device_gpu_recover (struct amdgpu_device *adev, -struct amdgpu_job * job,bool force); +struct amdgpu_job * job);void amdgpu_device_pci_config_reset (struct amdgpu_device *adev);bool amdgpu_device_need_post (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +25 -13
@@ -3244,32 +3244,44 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,return r; } +/** +* amdgpu_device_should_recover_gpu - check if we should try GPU recovery +* +* @adev: amdgpu device pointer +* +* Check amdgpu_gpu_recovery and SRIOV status to see if we should try to recover +* a hung GPU. +*/ +bool amdgpu_device_should_recover_gpu (struct amdgpu_device *adev) +{ +if (!amdgpu_device_ip_check_soft_reset (adev)) { +DRM_INFO ("Timeout, but no hardware hang detected.\n" ); +return false; + } + +if (amdgpu_gpu_recovery ==0 || (amdgpu_gpu_recovery ==-1 && + !amdgpu_sriov_vf (adev))) { +DRM_INFO ("GPU recovery disabled.\n" ); +return false; + } + +return true; +} +/** * amdgpu_device_gpu_recover - reset the asic and recover scheduler * * @adev: amdgpu device pointer * @job: which job trigger hang -* @force: forces reset regardless of amdgpu_gpu_recovery * * Attempt to reset the GPU if it has hung (all asics). * Returns 0 for success or an error on failure. */ int amdgpu_device_gpu_recover (struct amdgpu_device *adev, -struct amdgpu_job *job,bool force) +struct amdgpu_job *job) {int i, r, resched; -if (!force && !amdgpu_device_ip_check_soft_reset (adev)) { -DRM_INFO ("No hardware hang detected. Did some blocks stall?\n" ); -return 0 ; - } - -if (!force && (amdgpu_gpu_recovery ==0 || - (amdgpu_gpu_recovery ==-1 && !amdgpu_sriov_vf (adev)))) { -DRM_INFO ("GPU recovery disabled.\n" ); -return 0 ; - } -dev_info (adev->dev,"GPU reset begin!\n" );mutex_lock (&adev->lock_reset);
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +1 -1
@@ -702,7 +702,7 @@ static int amdgpu_debugfs_gpu_recover(struct seq_file *m, void *data)struct amdgpu_device *adev = dev->dev_private;seq_printf (m,"gpu recover\n" ); -amdgpu_device_gpu_recover (adev,NULL , true); +amdgpu_device_gpu_recover (adev,NULL );return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2 -2
@@ -105,8 +105,8 @@ static void amdgpu_irq_reset_work_func(struct work_struct *work) struct amdgpu_device *adev = container_of(work, struct amdgpu_device, reset_work); -if (!amdgpu_sriov_vf (adev)) -amdgpu_device_gpu_recover (adev,NULL , false); +if (!amdgpu_sriov_vf (adev) &&amdgpu_device_should_recover_gpu (adev)) +amdgpu_device_gpu_recover (adev,NULL ); }/**
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +2 -1
@@ -37,7 +37,8 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job) job->base.sched->name,atomic_read (&ring->fence_drv.last_seq), ring->fence_drv.sync_seq); -amdgpu_device_gpu_recover (ring->adev, job, false); +if (amdgpu_device_should_recover_gpu (ring->adev)) +amdgpu_device_gpu_recover (ring->adev, job); } int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c +2 -2
@@ -266,8 +266,8 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work) }/* Trigger recovery for world switch failure if no TDR */ -if (amdgpu_lockup_timeout ==0 ) -amdgpu_device_gpu_recover (adev,NULL , true); +if (amdgpu_device_should_recover_gpu (adev)) +amdgpu_device_gpu_recover (adev,NULL ); } static int xgpu_ai_set_mailbox_rcv_irq(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c +2 -1
@@ -521,7 +521,8 @@ static void xgpu_vi_mailbox_flr_work(struct work_struct *work) }/* Trigger recovery due to world switch failure */ -amdgpu_device_gpu_recover (adev,NULL , false); +if (amdgpu_device_should_recover_gpu (adev)) +amdgpu_device_gpu_recover (adev,NULL ); } static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev,
Signature · 6 lines
2.14.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): 20180822100457.52546-2-christian.koenig-5C7GfCeVMHo@public.gmane.org
Huang Rui
Reviewed-byRe: [PATCH 2/6] drm/amdgpu: cleanup GPU recovery check a bit
Quoted 65 lines · Christian König
Check if we should call the function instead of providing the forced flag.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 38 ++++++++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 ++- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 3 ++- 7 files changed, 36 insertions(+), 21 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +2
-1@@ -1158,8 +1158,9 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_asic_need_full_reset (adev) (adev)->asic_funcs->need_full_reset((adev))/* Common functions */ +bool amdgpu_device_should_recover_gpu (struct amdgpu_device *adev);int amdgpu_device_gpu_recover (struct amdgpu_device *adev, -struct amdgpu_job * job,bool force); +struct amdgpu_job * job);void amdgpu_device_pci_config_reset (struct amdgpu_device *adev);bool amdgpu_device_need_post (struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +24
-0@@ -3244,32 +3244,44 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,return r; } +/** +* amdgpu_device_should_recover_gpu - check if we should try GPU recovery +* +* @adev: amdgpu device pointer +* +* Check amdgpu_gpu_recovery and SRIOV status to see if we should try to recover +* a hung GPU. +*/ +bool amdgpu_device_should_recover_gpu (struct amdgpu_device *adev) +{ +if (!amdgpu_device_ip_check_soft_reset (adev)) { +DRM_INFO ("Timeout, but no hardware hang detected.\n" ); +return false; + } + +if (amdgpu_gpu_recovery ==0 || (amdgpu_gpu_recovery ==-1 && + !amdgpu_sriov_vf (adev))) { +DRM_INFO ("GPU recovery disabled.\n" ); +return false; + } + +return true; +} +/** * amdgpu_device_gpu_recover - reset the asic and recover scheduler * * @adev: amdgpu device pointer
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, · line 3282
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-2* @job: which job trigger hang -* @force: forces reset regardless of amdgpu_gpu_recovery * * Attempt to reset the GPU if it has hung (all asics). * Returns 0 for success or an error on failure. */ int amdgpu_device_gpu_recover (struct amdgpu_device *adev, -struct amdgpu_job *job,bool force) +struct amdgpu_job *job) {
In my view, actually, we don't need return as "int" for this function. Because, no calling is to check the return value.
Others looks good for me.
Quoted 94 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-11int i, r, resched; -if (!force && !amdgpu_device_ip_check_soft_reset (adev)) { -DRM_INFO ("No hardware hang detected. Did some blocks stall?\n" ); -return 0 ; - } - -if (!force && (amdgpu_gpu_recovery ==0 || - (amdgpu_gpu_recovery ==-1 && !amdgpu_sriov_vf (adev)))) { -DRM_INFO ("GPU recovery disabled.\n" ); -return 0 ; - } -dev_info (adev->dev,"GPU reset begin!\n" );mutex_lock (&adev->lock_reset);drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +1
-1@@ -702,7 +702,7 @@ static int amdgpu_debugfs_gpu_recover(struct seq_file *m, void *data)struct amdgpu_device *adev = dev->dev_private;seq_printf (m,"gpu recover\n" ); -amdgpu_device_gpu_recover (adev,NULL , true); +amdgpu_device_gpu_recover (adev,NULL );return 0 ; }drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2
-2@@ -105,8 +105,8 @@ static void amdgpu_irq_reset_work_func(struct work_struct *work) struct amdgpu_device *adev = container_of(work, struct amdgpu_device, reset_work); -if (!amdgpu_sriov_vf (adev)) -amdgpu_device_gpu_recover (adev,NULL , false); +if (!amdgpu_sriov_vf (adev) &&amdgpu_device_should_recover_gpu (adev)) +amdgpu_device_gpu_recover (adev,NULL ); }/** drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +2
-1@@ -37,7 +37,8 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job) job->base.sched->name,atomic_read (&ring->fence_drv.last_seq), ring->fence_drv.sync_seq); -amdgpu_device_gpu_recover (ring->adev, job, false); +if (amdgpu_device_should_recover_gpu (ring->adev)) +amdgpu_device_gpu_recover (ring->adev, job); } int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c +2
-2@@ -266,8 +266,8 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work) }/* Trigger recovery for world switch failure if no TDR */ -if (amdgpu_lockup_timeout ==0 ) -amdgpu_device_gpu_recover (adev,NULL , true); +if (amdgpu_device_should_recover_gpu (adev)) +amdgpu_device_gpu_recover (adev,NULL ); } static int xgpu_ai_set_mailbox_rcv_irq(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c +2
-1@@ -521,7 +521,8 @@ static void xgpu_vi_mailbox_flr_work(struct work_struct *work) }/* Trigger recovery due to world switch failure */ -amdgpu_device_gpu_recover (adev,NULL , false); +if (amdgpu_device_should_recover_gpu (adev)) +amdgpu_device_gpu_recover (adev,NULL ); } static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev,Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/6] drm/amdgpu: cleanup GPU recovery check a bit
Am 23.08.2018 um 04:54 schrieb Huang Rui:
Quoted 70 lines · Christian König
Quoted 69 lines
Check if we should call the function instead of providing the forced flag.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 38 ++++++++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 ++- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 3 ++- 7 files changed, 36 insertions(+), 21 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +2
-1@@ -1158,8 +1158,9 @@ int emu_soc_asic_init(struct amdgpu_device *adev);#define amdgpu_asic_need_full_reset (adev) (adev)->asic_funcs->need_full_reset((adev))/* Common functions */ +bool amdgpu_device_should_recover_gpu (struct amdgpu_device *adev);int amdgpu_device_gpu_recover (struct amdgpu_device *adev, -struct amdgpu_job * job,bool force); +struct amdgpu_job * job);void amdgpu_device_pci_config_reset (struct amdgpu_device *adev);bool amdgpu_device_need_post (struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +24
-1@@ -3244,32 +3244,44 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,return r; } +/** +* amdgpu_device_should_recover_gpu - check if we should try GPU recovery +* +* @adev: amdgpu device pointer +* +* Check amdgpu_gpu_recovery and SRIOV status to see if we should try to recover +* a hung GPU. +*/ +bool amdgpu_device_should_recover_gpu (struct amdgpu_device *adev) +{ +if (!amdgpu_device_ip_check_soft_reset (adev)) { +DRM_INFO ("Timeout, but no hardware hang detected.\n" ); +return false; + } + +if (amdgpu_gpu_recovery ==0 || (amdgpu_gpu_recovery ==-1 && + !amdgpu_sriov_vf (adev))) { +DRM_INFO ("GPU recovery disabled.\n" ); +return false; + } + +return true; +} +/** * amdgpu_device_gpu_recover - reset the asic and recover scheduler * * @adev: amdgpu device pointer * @job: which job trigger hang -* @force: forces reset regardless of amdgpu_gpu_recovery * * Attempt to reset the GPU if it has hung (all asics).
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, · line 3282
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1* Returns 0 for success or an error on failure. */ int amdgpu_device_gpu_recover (struct amdgpu_device *adev, -struct amdgpu_job *job,bool force) +struct amdgpu_job *job) {In my view, actually, we don't need return as "int" for this function. Because, no calling is to check the return value.
Yeah, that is also something I noticed.
But for now this cleanup is only about the force flag and the check if the function should be called or not.
Quoted 2 lines
Others looks good for me.
Reviewed-by Huang Rui <[email protected]>
Thanks,
Christian.
Quoted 87 lines
Quoted 87 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-11int i, r, resched; -if (!force && !amdgpu_device_ip_check_soft_reset (adev)) { -DRM_INFO ("No hardware hang detected. Did some blocks stall?\n" ); -return 0 ; - } - -if (!force && (amdgpu_gpu_recovery ==0 || - (amdgpu_gpu_recovery ==-1 && !amdgpu_sriov_vf (adev)))) { -DRM_INFO ("GPU recovery disabled.\n" ); -return 0 ; - } -dev_info (adev->dev,"GPU reset begin!\n" );mutex_lock (&adev->lock_reset);drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +1
-1@@ -702,7 +702,7 @@ static int amdgpu_debugfs_gpu_recover(struct seq_file *m, void *data)struct amdgpu_device *adev = dev->dev_private;seq_printf (m,"gpu recover\n" ); -amdgpu_device_gpu_recover (adev,NULL , true); +amdgpu_device_gpu_recover (adev,NULL );return 0 ; }drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2
-2@@ -105,8 +105,8 @@ static void amdgpu_irq_reset_work_func(struct work_struct *work) struct amdgpu_device *adev = container_of(work, struct amdgpu_device, reset_work); -if (!amdgpu_sriov_vf (adev)) -amdgpu_device_gpu_recover (adev,NULL , false); +if (!amdgpu_sriov_vf (adev) &&amdgpu_device_should_recover_gpu (adev)) +amdgpu_device_gpu_recover (adev,NULL ); }/** drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +2
-1@@ -37,7 +37,8 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job) job->base.sched->name,atomic_read (&ring->fence_drv.last_seq), ring->fence_drv.sync_seq); -amdgpu_device_gpu_recover (ring->adev, job, false); +if (amdgpu_device_should_recover_gpu (ring->adev)) +amdgpu_device_gpu_recover (ring->adev, job); } int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c +2
-2@@ -266,8 +266,8 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work) }/* Trigger recovery for world switch failure if no TDR */ -if (amdgpu_lockup_timeout ==0 ) -amdgpu_device_gpu_recover (adev,NULL , true); +if (amdgpu_device_should_recover_gpu (adev)) +amdgpu_device_gpu_recover (adev,NULL ); } static int xgpu_ai_set_mailbox_rcv_irq(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c +2
-1@@ -521,7 +521,8 @@ static void xgpu_vi_mailbox_flr_work(struct work_struct *work) }/* Trigger recovery due to world switch failure */ -amdgpu_device_gpu_recover (adev,NULL , false); +if (amdgpu_device_should_recover_gpu (adev)) +amdgpu_device_gpu_recover (adev,NULL ); }
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c +0
-0static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev,Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amdgpu: add ring soft recovery v2
In reply to a message not in the archiveInstead of hammering hard on the GPU try a soft recovery first.
v2: reorder code a bit
--- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 ++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 ++++ 3 files changed, 34 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +6 -0
@@ -33,6 +33,12 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)struct amdgpu_ring *ring =to_amdgpu_ring (s_job->sched);struct amdgpu_job *job =to_amdgpu_job (s_job); +if (amdgpu_ring_soft_recovery (ring, job->vmid, s_job->s_fence->parent)) { +DRM_ERROR ("ring %s timeout, but soft recovered\n" , + s_job->sched->name); +return ; + } +DRM_ERROR ("ring %s timeout, signaled seq=%u, emitted seq=%u\n" , job->base.sched->name,atomic_read (&ring->fence_drv.last_seq), ring->fence_drv.sync_seq);
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +24 -0
@@ -383,6 +383,30 @@ void amdgpu_ring_emit_reg_write_reg_wait_helper(struct amdgpu_ring *ring,amdgpu_ring_emit_reg_wait (ring, reg1, mask, mask); } +/** +* amdgpu_ring_soft_recovery - try to soft recover a ring lockup +* +* @ring: ring to try the recovery on +* @vmid: VMID we try to get going again +* @fence: timedout fence +* +* Tries to get a ring proceeding again when it is stuck. +*/ +bool amdgpu_ring_soft_recovery (struct amdgpu_ring *ring,unsigned int vmid, +struct dma_fence *fence) +{ +ktime_t deadline =ktime_add_us (ktime_get (),1000 ); + +if (!ring->funcs->soft_recovery) +return false; + +while (!dma_fence_is_signaled (fence) && +ktime_to_ns (ktime_sub (deadline,ktime_get ())) >0 ) + ring->funcs->soft_recovery (ring, vmid); + +return dma_fence_is_signaled (fence); +} +/* * Debugfs info */
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +4 -0
@@ -168,6 +168,8 @@ struct amdgpu_ring_funcs {/* priority functions */ void (*set_priority) (struct amdgpu_ring *ring,enum drm_sched_priority priority); +/* Try to soft recover the ring to make the fence signal */ +void (*soft_recovery)(struct amdgpu_ring *ring,unsigned vmid); };struct amdgpu_ring {
@@ -260,6 +262,8 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring);void amdgpu_ring_emit_reg_write_reg_wait_helper (struct amdgpu_ring *ring,uint32_t reg0,uint32_t val0,uint32_t reg1,uint32_t val1); +bool amdgpu_ring_soft_recovery (struct amdgpu_ring *ring,unsigned int vmid, +struct dma_fence *fence);static inline void amdgpu_ring_clear_ring (struct amdgpu_ring *ring) {
Signature · 6 lines
2.14.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): 20180822100457.52546-3-christian.koenig-5C7GfCeVMHo@public.gmane.org
Huang Rui
Reviewed-byRe: [PATCH 3/6] drm/amdgpu: add ring soft recovery v2
Quoted 5 lines · Christian König
Instead of hammering hard on the GPU try a soft recovery first.
v2: reorder code a bit
Signed-off-by Christian König <[email protected]>
Quoted 87 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 ++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 ++++ 3 files changed, 34 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +6
-0@@ -33,6 +33,12 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)struct amdgpu_ring *ring =to_amdgpu_ring (s_job->sched);struct amdgpu_job *job =to_amdgpu_job (s_job); +if (amdgpu_ring_soft_recovery (ring, job->vmid, s_job->s_fence->parent)) { +DRM_ERROR ("ring %s timeout, but soft recovered\n" , + s_job->sched->name); +return ; + } +DRM_ERROR ("ring %s timeout, signaled seq=%u, emitted seq=%u\n" , job->base.sched->name,atomic_read (&ring->fence_drv.last_seq), ring->fence_drv.sync_seq);drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +24
-0@@ -383,6 +383,30 @@ void amdgpu_ring_emit_reg_write_reg_wait_helper(struct amdgpu_ring *ring,amdgpu_ring_emit_reg_wait (ring, reg1, mask, mask); } +/** +* amdgpu_ring_soft_recovery - try to soft recover a ring lockup +* +* @ring: ring to try the recovery on +* @vmid: VMID we try to get going again +* @fence: timedout fence +* +* Tries to get a ring proceeding again when it is stuck. +*/ +bool amdgpu_ring_soft_recovery (struct amdgpu_ring *ring,unsigned int vmid, +struct dma_fence *fence) +{ +ktime_t deadline =ktime_add_us (ktime_get (),1000 ); + +if (!ring->funcs->soft_recovery) +return false; + +while (!dma_fence_is_signaled (fence) && +ktime_to_ns (ktime_sub (deadline,ktime_get ())) >0 ) + ring->funcs->soft_recovery (ring, vmid); + +return dma_fence_is_signaled (fence); +} +/* * Debugfs info */ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +4
-0@@ -168,6 +168,8 @@ struct amdgpu_ring_funcs {/* priority functions */ void (*set_priority) (struct amdgpu_ring *ring,enum drm_sched_priority priority); +/* Try to soft recover the ring to make the fence signal */ +void (*soft_recovery)(struct amdgpu_ring *ring,unsigned vmid); };struct amdgpu_ring {@@ -260,6 +262,8 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring);void amdgpu_ring_emit_reg_write_reg_wait_helper (struct amdgpu_ring *ring,uint32_t reg0,uint32_t val0,uint32_t reg1,uint32_t val1); +bool amdgpu_ring_soft_recovery (struct amdgpu_ring *ring,unsigned int vmid, +struct dma_fence *fence);static inline void amdgpu_ring_clear_ring (struct amdgpu_ring *ring) {Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amdgpu: implement soft_recovery for GFX7
In reply to a message not in the archiveTry to kill waves on the SQ.
--- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +13 -0
@@ -4212,6 +4212,18 @@ static void gfx_v7_0_ring_emit_gds_switch(struct amdgpu_ring *ring,amdgpu_ring_write (ring, (1 << (oa_size + oa_base)) - (1 << oa_base)); } +static void gfx_v7_0_ring_soft_recovery (struct amdgpu_ring *ring,unsigned vmid) +{ +struct amdgpu_device *adev = ring->adev; +uint32_t value =0 ; + + value =REG_SET_FIELD (value,SQ_CMD ,CMD ,0x03 ); + value =REG_SET_FIELD (value,SQ_CMD ,MODE ,0x01 ); + value =REG_SET_FIELD (value,SQ_CMD ,CHECK_VMID ,1 ); + value =REG_SET_FIELD (value,SQ_CMD ,VM_ID , vmid); +WREG32 (mmSQ_CMD, value); +} +static uint32_t wave_read_ind (struct amdgpu_device *adev,uint32_t simd,uint32_t wave,uint32_t address) { WREG32(mmSQ_IND_INDEX,
@@ -5088,6 +5100,7 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = { .pad_ib = amdgpu_ring_generic_pad_ib, .emit_cntxcntl = gfx_v7_ring_emit_cntxcntl, .emit_wreg = gfx_v7_0_ring_emit_wreg, + .soft_recovery = gfx_v7_0_ring_soft_recovery, };static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_compute = {
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amdgpu: implement soft_recovery for GFX8 v2
In reply to a message not in the archiveTry to kill waves on the SQ.
v2: only for the GFX ring for now.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +13 -0
@@ -6714,6 +6714,18 @@ static void gfx_v8_0_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,amdgpu_ring_write (ring, val); } +static void gfx_v8_0_ring_soft_recovery (struct amdgpu_ring *ring,unsigned vmid) +{ +struct amdgpu_device *adev = ring->adev; +uint32_t value =0 ; + + value =REG_SET_FIELD (value,SQ_CMD ,CMD ,0x03 ); + value =REG_SET_FIELD (value,SQ_CMD ,MODE ,0x01 ); + value =REG_SET_FIELD (value,SQ_CMD ,CHECK_VMID ,1 ); + value =REG_SET_FIELD (value,SQ_CMD ,VM_ID , vmid); +WREG32 (mmSQ_CMD, value); +} +static void gfx_v8_0_set_gfx_eop_interrupt_state (struct amdgpu_device *adev,enum amdgpu_interrupt_state state) {
@@ -7171,6 +7183,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .init_cond_exec = gfx_v8_0_ring_emit_init_cond_exec, .patch_cond_exec = gfx_v8_0_ring_emit_patch_cond_exec, .emit_wreg = gfx_v8_0_ring_emit_wreg, + .soft_recovery = gfx_v8_0_ring_soft_recovery, };static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = {
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amdgpu: implement soft_recovery for GFX9
In reply to a message not in the archiveTry to kill waves on the SQ.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +13 -0
@@ -4421,6 +4421,18 @@ static void gfx_v9_0_ring_emit_reg_write_reg_wait(struct amdgpu_ring *ring, ref, mask); } +static void gfx_v9_0_ring_soft_recovery (struct amdgpu_ring *ring,unsigned vmid) +{ +struct amdgpu_device *adev = ring->adev; +uint32_t value =0 ; + + value =REG_SET_FIELD (value,SQ_CMD ,CMD ,0x03 ); + value =REG_SET_FIELD (value,SQ_CMD ,MODE ,0x01 ); + value =REG_SET_FIELD (value,SQ_CMD ,CHECK_VMID ,1 ); + value =REG_SET_FIELD (value,SQ_CMD ,VM_ID , vmid); +WREG32 (mmSQ_CMD, value); +} +static void gfx_v9_0_set_gfx_eop_interrupt_state (struct amdgpu_device *adev,enum amdgpu_interrupt_state state) {
@@ -4743,6 +4755,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { .emit_wreg = gfx_v9_0_ring_emit_wreg, .emit_reg_wait = gfx_v9_0_ring_emit_reg_wait, .emit_reg_write_reg_wait = gfx_v9_0_ring_emit_reg_write_reg_wait, + .soft_recovery = gfx_v9_0_ring_soft_recovery, };static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx