drm/amdgpu: drop redundant cg/pg ungate on runpm enter

Evan Quan · alexdeucher · commit f7b52890daba · 2020-05-01T09:23:49.000-04:00
CG/PG ungate is already performed in ip_suspend_phase1. Otherwise, the CG/PG ungate will be performed twice. That will cause gfxoff disablement is performed twice also on runpm enter while gfxoff enablemnt once on rump exit. That will put gfxoff into disabled state. Fixes: b2a7e97 ("drm/amdgpu: fix the hw hang during perform system reboot and reset") 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
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3372,9 +3372,6 @@ 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_ras_suspend(adev);
 
 	r = amdgpu_device_ip_suspend_phase1(adev);

Original file line number	Diff line number	Diff line change
`@@ -3372,9 +3372,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)`
`3372`	`3372`	`}`
`3373`	`3373`	`}`
`3374`	`3374`
`3375`		`- amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);`
`3376`		`- amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);`
`3377`		`-`
`3378`	`3375`	`amdgpu_ras_suspend(adev);`
`3379`	`3376`
`3380`	`3377`	`r = amdgpu_device_ip_suspend_phase1(adev);`