Commit 487eca11 authored Apr 07, 2020 by Prike Liang Committed by Alex Deucher Apr 08, 2020

drm/amdgpu: fix gfx hang during suspend with video playback (v2)



The system will be hang up during S3 suspend because of SMU is pending
for GC not respose the register CP_HQD_ACTIVE access request.This issue
root cause of accessing the GC register under enter GFX CGGPG and can
be fixed by disable GFX CGPG before perform suspend.

v2: Use disable the GFX CGPG instead of RLC safe mode guard.

Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Tested-by: Mengbing Wang <Mengbing.Wang@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

parent 72f5b5a3

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -2340,8 +2340,6 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)
		{
		int i, r;

		amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);
		amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);

		for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
		if (!adev->ip_blocks[i].status.valid)
		@@ -3356,6 +3354,9 @@ 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);

Admin message