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

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

drm/amdgpu: irq resume should be immediately after gpu resume 



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 568ba157

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

+1 −1
Original line number Diff line number Diff line
@@ -2094,6 +2094,7 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
		amdgpu_atombios_scratch_regs_restore(adev);

	}

	if (!r) {

		amdgpu_irq_gpu_reset_resume_helper(adev);

		r = amdgpu_ib_ring_tests(adev);

		if (r) {

			dev_err(adev->dev, "ib ring test failed (%d).\n", r);
@@ -2124,7 +2125,6 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
		/* bad news, how to tell it to userspace ? */

		dev_info(adev->dev, "GPU reset failed\n");

	}

	amdgpu_irq_gpu_reset_resume_helper(adev);



	return r;

}