Commit c457a273 authored Apr 24, 2020 by Evan Quan Committed by Alex Deucher May 01, 2020

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: 487eca11 ("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

parent e3dcd86b

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message