drm/amdgpu: fix the hw hang during perform system reboot and reset

Prike Liang · alexdeucher · commit b2a7e9735ab2 · 2020-04-14T12:48:01.000-04:00
The system reboot failed as some IP blocks enter power gate before perform hw resource destory. Meanwhile use unify interface to set device CGPG to ungate state can simplify the amdgpu poweroff or reset ungate guard. Fixes: 487eca1 ("drm/amdgpu: fix gfx hang during suspend with video playback (v2)") Signed-off-by: Prike Liang <Prike.Liang@amd.com> Tested-by: Mengbing Wang <Mengbing.Wang@amd.com> Tested-by: Paul Menzel <pmenzel@molgen.mpg.de> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2356,6 +2356,8 @@ 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)

Original file line number	Diff line number	Diff line change
`@@ -2356,6 +2356,8 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)`
`2356`	`2356`	`{`
`2357`	`2357`	`int i, r;`
`2358`	`2358`
	`2359`	`+ amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);`
	`2360`	`+ amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);`
`2359`	`2361`
`2360`	`2362`	`for (i = adev->num_ip_blocks - 1; i >= 0; i--) {`
`2361`	`2363`	`if (!adev->ip_blocks[i].status.valid)`