Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca198528 authored by Flora Cui's avatar Flora Cui Committed by Alex Deucher
Browse files

drm/amdgpu: fix s4 resume 



No need to re-init asic if it's already been initialized.
Skip IB tests since kernel processes are frozen in thaw.

Signed-off-by: default avatarFlora Cui <Flora.Cui@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent db5cffcd

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

+9 −4
Original line number Diff line number Diff line
@@ -1795,15 +1795,20 @@ int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon) 
	}



	/* post card */

	if (!amdgpu_card_posted(adev))

		amdgpu_atom_asic_init(adev->mode_info.atom_context);



	r = amdgpu_resume(adev);

	if (r)

		DRM_ERROR("amdgpu_resume failed (%d).\n", r);



	amdgpu_fence_driver_resume(adev);



	if (resume) {

		r = amdgpu_ib_ring_tests(adev);

		if (r)

			DRM_ERROR("ib ring test failed (%d).\n", r);

	}



	r = amdgpu_late_init(adev);

	if (r)