Commit eac4c54b authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amdgpu: don't set s3 and s0ix at the same time 



This makes it clearer which codepaths are in use specifically in
one state or the other.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e53d9665

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

+4 −2
Original line number Diff line number Diff line
@@ -2166,9 +2166,9 @@ static int amdgpu_pmops_suspend(struct device *dev) 


	if (amdgpu_acpi_is_s0ix_active(adev))

		adev->in_s0ix = true;

	else

		adev->in_s3 = true;

	r = amdgpu_device_suspend(drm_dev, true);

	adev->in_s3 = false;

	if (r)

		return r;

	if (!adev->in_s0ix)
@@ -2189,6 +2189,8 @@ static int amdgpu_pmops_resume(struct device *dev) 
	r = amdgpu_device_resume(drm_dev, true);

	if (amdgpu_acpi_is_s0ix_active(adev))

		adev->in_s0ix = false;

	else

		adev->in_s3 = false;

	return r;

}