diff options
| author | Yunxiang Li <[email protected]> | 2024-04-22 18:59:02 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2024-05-02 19:40:44 +0000 |
| commit | f4322b9f8ad5f9f62add288c785d2e10bb6a5efe (patch) | |
| tree | 16568819259068d87856a8dc5cde125945735d2d /drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | |
| parent | drm/amdgpu: update vf to pf message retry from 2 to 5 (diff) | |
| download | kernel-f4322b9f8ad5f9f62add288c785d2e10bb6a5efe.tar.gz kernel-f4322b9f8ad5f9f62add288c785d2e10bb6a5efe.zip | |
drm/amdgpu: Fix two reset triggered in a row
Some times a hang GPU causes multiple reset sources to schedule resets.
The second source will be able to trigger an unnecessary reset if they
schedule after we call amdgpu_device_stop_pending_resets.
Move amdgpu_device_stop_pending_resets to after the reset is done. Since
at this point the GPU is supposedly in a good state, any reset scheduled
after this point would be a legitimate reset.
Remove unnecessary and incorrect checks for amdgpu_in_reset that was
kinda serving this purpose.
Signed-off-by: Yunxiang Li <[email protected]>
Reviewed-by: Lijo Lazar <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c index 1cb98e6c09c8..fb7cf4214e3a 100644 --- a/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c +++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c @@ -358,7 +358,7 @@ static int xgpu_nv_mailbox_rcv_irq(struct amdgpu_device *adev, switch (event) { case IDH_FLR_NOTIFICATION: - if (amdgpu_sriov_runtime(adev) && !amdgpu_in_reset(adev)) + if (amdgpu_sriov_runtime(adev)) WARN_ONCE(!amdgpu_reset_domain_schedule(adev->reset_domain, &adev->virt.flr_work), "Failed to queue work! at %s", |