Skip to content

Commit 063e768

Browse files
Evan Quanalexdeucher
authored andcommitted
drm/amdgpu: add fbdev suspend/resume on gpu reset
This can fix the baco reset failure seen on Navi10. And this should be a low risk fix as the same sequence is already used for system suspend/resume. Signed-off-by: Evan Quan <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 5bbc660 commit 063e768

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3913,6 +3913,8 @@ static int amdgpu_do_asic_reset(struct amdgpu_hive_info *hive,
39133913
if (r)
39143914
goto out;
39153915

3916+
amdgpu_fbdev_set_suspend(tmp_adev, 0);
3917+
39163918
/* must succeed. */
39173919
amdgpu_ras_resume(tmp_adev);
39183920

@@ -4086,6 +4088,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
40864088
*/
40874089
amdgpu_unregister_gpu_instance(tmp_adev);
40884090

4091+
amdgpu_fbdev_set_suspend(adev, 1);
4092+
40894093
/* disable ras on ALL IPs */
40904094
if (!(in_ras_intr && !use_baco) &&
40914095
amdgpu_device_ip_need_full_reset(tmp_adev))

0 commit comments

Comments
 (0)