Skip to content

Commit

Permalink
drm/amdgpu: move kfd suspend after ip_suspend_phase1
Browse files Browse the repository at this point in the history
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 <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
  • Loading branch information
Evan Quan authored and Alex Deucher committed May 1, 2020
1 parent e3dcd86 commit c457a27
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Original file line number Diff line number Diff line change
@@ -3375,12 +3375,12 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)
amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);
amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);

amdgpu_amdkfd_suspend(adev, !fbcon);

amdgpu_ras_suspend(adev);

r = amdgpu_device_ip_suspend_phase1(adev);

amdgpu_amdkfd_suspend(adev, !fbcon);

/* evict vram memory */
amdgpu_bo_evict_vram(adev);

0 comments on commit c457a27

Please sign in to comment.