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

Commit 1f465087 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: ib test first after gpu reset 



Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent aa1c8900

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

+10 −10
Original line number Diff line number Diff line
@@ -1987,6 +1987,16 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
	/* restore scratch */

	amdgpu_atombios_scratch_regs_restore(adev);

	if (!r) {

		r = amdgpu_ib_ring_tests(adev);

		if (r) {

			dev_err(adev->dev, "ib ring test failed (%d).\n", r);

			if (saved) {

				saved = false;

				r = amdgpu_suspend(adev);

				goto retry;

			}

		}



		for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

			struct amdgpu_ring *ring = adev->rings[i];

			if (!ring)
@@ -1997,16 +2007,6 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
			ring_sizes[i] = 0;

			ring_data[i] = NULL;

		}



		r = amdgpu_ib_ring_tests(adev);

		if (r) {

			dev_err(adev->dev, "ib ring test failed (%d).\n", r);

			if (saved) {

				saved = false;

				r = amdgpu_suspend(adev);

				goto retry;

			}

		}

	} else {

		dev_err(adev->dev, "asic resume failed (%d).\n", r);

		for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {