Commit 9a1cddd6 authored by jqdeng's avatar jqdeng Committed by Alex Deucher
Browse files

drm/amdgpu: Fix repeatly flr issue 



Only for no job running test case need to do recover in
flr notification.
For having job in mirror list, then let guest driver to
hit job timeout, and then do recover.

Signed-off-by: default avatarjqdeng <Emily.Deng@amd.com>
Acked-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5ce99853

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1133,6 +1133,7 @@ int emu_soc_asic_init(struct amdgpu_device *adev); 
#define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter));



/* Common functions */

bool amdgpu_device_has_job_running(struct amdgpu_device *adev);

bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev);

int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

			      struct amdgpu_job* job);

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

+28 −0
Original line number Diff line number Diff line
@@ -3922,6 +3922,34 @@ error: 
	return r;

}



/**

 * amdgpu_device_has_job_running - check if there is any job in mirror list

 *

 * @adev: amdgpu device pointer

 *

 * check if there is any job in mirror list

 */

bool amdgpu_device_has_job_running(struct amdgpu_device *adev)

{

	int i;

	struct drm_sched_job *job;



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

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



		if (!ring || !ring->sched.thread)

			continue;



		spin_lock(&ring->sched.job_list_lock);

		job = list_first_entry_or_null(&ring->sched.ring_mirror_list,

				struct drm_sched_job, node);

		spin_unlock(&ring->sched.job_list_lock);

		if (job)

			return true;

	}

	return false;

}



/**

 * amdgpu_device_should_recover_gpu - check if we should try GPU recovery

 *

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

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


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

	if (amdgpu_device_should_recover_gpu(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

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


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

	if (amdgpu_device_should_recover_gpu(adev)

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

		&& (amdgpu_device_has_job_running(adev) ||

		adev->sdma_timeout == MAX_SCHEDULE_TIMEOUT ||

		adev->gfx_timeout == MAX_SCHEDULE_TIMEOUT ||

		adev->compute_timeout == MAX_SCHEDULE_TIMEOUT ||

		adev->video_timeout == MAX_SCHEDULE_TIMEOUT))

CRA Git | Maintained and supported by SUSTech CRA and CCSE