Commit 2a9787dc authored by Liu ChengZhe's avatar Liu ChengZhe Committed by Alex Deucher
Browse files

drm/amdgpu: Do gpu recovery when no job is running 



In function flr_work, we should do gpu recovery when no job
is running. Fix the logic by inverting it.

v2: modify the description

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarLiu ChengZhe <ChengZhe.Liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent edb084f4

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

+2 −1
Original line number Diff line number Diff line
@@ -262,7 +262,8 @@ flr_done: 


	/* Trigger recovery for world switch failure if no TDR */

	if (amdgpu_device_should_recover_gpu(adev)

		&& (amdgpu_device_has_job_running(adev) || adev->sdma_timeout == MAX_SCHEDULE_TIMEOUT))

		&& (!amdgpu_device_has_job_running(adev) ||

		adev->sdma_timeout == MAX_SCHEDULE_TIMEOUT))

		amdgpu_device_gpu_recover(adev, NULL);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ flr_done: 


	/* Trigger recovery for world switch failure if no TDR */

	if (amdgpu_device_should_recover_gpu(adev)

		&& (amdgpu_device_has_job_running(adev) ||

		&& (!amdgpu_device_has_job_running(adev) ||

		adev->sdma_timeout == MAX_SCHEDULE_TIMEOUT ||

		adev->gfx_timeout == MAX_SCHEDULE_TIMEOUT ||

		adev->compute_timeout == MAX_SCHEDULE_TIMEOUT ||

CRA Git | Maintained and supported by SUSTech CRA and CCSE