Commit ed67f729 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: move mes self test after drm sched re-started 



mes self test rely on vm mapping, move it after
drm sched re-started so that vm mapping can work
during gpu reset.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Acked-and-tested-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0da0def7

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

+3 −0
Original line number Diff line number Diff line
@@ -5299,6 +5299,9 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
			drm_sched_start(&ring->sched, !tmp_adev->asic_reset_res);

		}



		if (adev->enable_mes)

			amdgpu_mes_self_test(tmp_adev);



		if (!drm_drv_uses_atomic_modeset(adev_to_drm(tmp_adev)) && !job_signaled) {

			drm_helper_resume_force_mode(adev_to_drm(tmp_adev));

		}

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

+2 −1
Original line number Diff line number Diff line
@@ -1233,6 +1233,7 @@ static int mes_v10_0_late_init(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (!amdgpu_in_reset(adev))

		amdgpu_mes_self_test(adev);



	return 0;

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

+2 −1
Original line number Diff line number Diff line
@@ -1280,6 +1280,7 @@ static int mes_v11_0_late_init(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (!amdgpu_in_reset(adev))

		amdgpu_mes_self_test(adev);



	return 0;