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

drm/amdgpu: Rename amdgpu_device_gpu_recover_imp back to amdgpu_device_gpu_recover 



We removed the wrapper that was queueing the recover function
into reset domain queue who was using this name.

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 b5fd0cf3

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

+1 −1
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ 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);

int amdgpu_device_gpu_recover_imp(struct amdgpu_device *adev,

int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

			      struct amdgpu_job *job);

void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);

int amdgpu_device_pci_reset(struct amdgpu_device *adev);

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

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work) 
	struct amdgpu_device *adev = container_of(work, struct amdgpu_device,

						  kfd.reset_work);



	amdgpu_device_gpu_recover_imp(adev, NULL);

	amdgpu_device_gpu_recover(adev, NULL);

}



void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)

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

+1 −1
Original line number Diff line number Diff line
@@ -5076,7 +5076,7 @@ static void amdgpu_device_recheck_guilty_jobs( 
 * Returns 0 for success or an error on failure.

 */



int amdgpu_device_gpu_recover_imp(struct amdgpu_device *adev,

int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

			      struct amdgpu_job *job)

{

	struct list_head device_list, *device_list_handle =  NULL;

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

+1 −1
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static void amdgpu_debugfs_reset_work(struct work_struct *work) 
	struct amdgpu_device *adev = container_of(work, struct amdgpu_device,

						  reset_work);



	amdgpu_device_gpu_recover_imp(adev, NULL);

	amdgpu_device_gpu_recover(adev, NULL);

}



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 
		  ti.process_name, ti.tgid, ti.task_name, ti.pid);



	if (amdgpu_device_should_recover_gpu(ring->adev)) {

		r = amdgpu_device_gpu_recover_imp(ring->adev, job);

		r = amdgpu_device_gpu_recover(ring->adev, job);

		if (r)

			DRM_ERROR("GPU Recovery Failed: %d\n", r);

	} else {