Skip to content

Commit c457a27

Browse files
Evan Quanalexdeucher
authored andcommitted
drm/amdgpu: move kfd suspend after ip_suspend_phase1
This sequence change should be safe as what did in ip_suspend_phase1 is to suspend DCE only. And this is a prerequisite for coming redundant cg/pg ungate dropping. Fixes: 487eca1 ("drm/amdgpu: fix gfx hang during suspend with video playback (v2)") Signed-off-by: Evan Quan <[email protected]> Acked-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent e3dcd86 commit c457a27

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3375,12 +3375,12 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)
33753375
amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);
33763376
amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);
33773377

3378-
amdgpu_amdkfd_suspend(adev, !fbcon);
3379-
33803378
amdgpu_ras_suspend(adev);
33813379

33823380
r = amdgpu_device_ip_suspend_phase1(adev);
33833381

3382+
amdgpu_amdkfd_suspend(adev, !fbcon);
3383+
33843384
/* evict vram memory */
33853385
amdgpu_bo_evict_vram(adev);
33863386

0 commit comments

Comments
 (0)