Commit 247c7b0d authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher
Browse files

drm/amdgpu: Stop any pending reset if another in progress. 



We skip rest requests if another one is already in progress.

Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cf727044

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

+27 −0
Original line number Diff line number Diff line
@@ -5065,6 +5065,27 @@ static void amdgpu_device_recheck_guilty_jobs( 
	}

}



static inline void amdggpu_device_stop_pedning_resets(struct amdgpu_device *adev)

{

	struct amdgpu_ras *con = amdgpu_ras_get_context(adev);



#if defined(CONFIG_DEBUG_FS)

	if (!amdgpu_sriov_vf(adev))

		cancel_work(&adev->reset_work);

#endif



	if (adev->kfd.dev)

		cancel_work(&adev->kfd.reset_work);



	if (amdgpu_sriov_vf(adev))

		cancel_work(&adev->virt.flr_work);



	if (con && adev->ras_enabled)

		cancel_work(&con->recovery_work);



}





/**

 * amdgpu_device_gpu_recover_imp - reset the asic and recover scheduler

 *
@@ -5220,6 +5241,12 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
				  r, adev_to_drm(tmp_adev)->unique);

			tmp_adev->asic_reset_res = r;

		}



		/*

		 * Drop all pending non scheduler resets. Scheduler resets

		 * were already dropped during drm_sched_stop

		 */

		amdggpu_device_stop_pedning_resets(tmp_adev);

	}



	tmp_vram_lost_counter = atomic_read(&((adev)->vram_lost_counter));