diff options
| author | Victor Zhao <Victor.Zhao@amd.com> | 2022-06-24 06:59:21 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2022-08-17 01:14:31 +0300 |
| commit | 72fadb13674f807f10a168fb7d020dde58ce6b0b (patch) | |
| tree | eaf6b36d8c433479fa5b4d7461cfd9f56ed3a5e9 /drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | |
| parent | bfaced6ee77484d8b9c6baf86a8e9406f80108c5 (diff) | |
| download | linux-72fadb13674f807f10a168fb7d020dde58ce6b0b.tar.xz | |
drm/amdgpu: revert context to stop engine before mode2 reset
For some hang caused by slow tests, engine cannot be stopped which
may cause resume failure after reset. In this case, force halt
engine by reverting context addresses
Signed-off-by: Victor Zhao <Victor.Zhao@amd.com>
Acked-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c index 2dbbda17848b..7aa570c1ce4a 100644 --- a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c +++ b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c @@ -97,6 +97,8 @@ sienna_cichlid_mode2_prepare_hwcontext(struct amdgpu_reset_control *reset_ctl, if (!amdgpu_sriov_vf(adev)) { if (adev->gfxhub.funcs->mode2_save_regs) adev->gfxhub.funcs->mode2_save_regs(adev); + if (adev->gfxhub.funcs->halt) + adev->gfxhub.funcs->halt(adev); r = sienna_cichlid_mode2_suspend_ip(adev); } |