Commit 5f152b5e authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu: rename amdgpu_gpu_recover

add device to the name for consistency.
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 55e0037a
...@@ -1887,7 +1887,8 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) ...@@ -1887,7 +1887,8 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
#define amdgpu_psp_check_fw_loading_status(adev, i) (adev)->firmware.funcs->check_fw_loading_status((adev), (i)) #define amdgpu_psp_check_fw_loading_status(adev, i) (adev)->firmware.funcs->check_fw_loading_status((adev), (i))
/* Common functions */ /* Common functions */
int amdgpu_gpu_recover(struct amdgpu_device *adev, struct amdgpu_job* job, bool force); int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
struct amdgpu_job* job, bool force);
bool amdgpu_need_backup(struct amdgpu_device *adev); bool amdgpu_need_backup(struct amdgpu_device *adev);
void amdgpu_device_pci_config_reset(struct amdgpu_device *adev); void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);
bool amdgpu_device_need_post(struct amdgpu_device *adev); bool amdgpu_device_need_post(struct amdgpu_device *adev);
......
...@@ -2611,7 +2611,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, ...@@ -2611,7 +2611,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
} }
/** /**
* amdgpu_gpu_recover - reset the asic and recover scheduler * amdgpu_device_gpu_recover - reset the asic and recover scheduler
* *
* @adev: amdgpu device pointer * @adev: amdgpu device pointer
* @job: which job trigger hang * @job: which job trigger hang
...@@ -2620,7 +2620,8 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, ...@@ -2620,7 +2620,8 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
* Attempt to reset the GPU if it has hung (all asics). * Attempt to reset the GPU if it has hung (all asics).
* Returns 0 for success or an error on failure. * Returns 0 for success or an error on failure.
*/ */
int amdgpu_gpu_recover(struct amdgpu_device *adev, struct amdgpu_job *job, bool force) int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
struct amdgpu_job *job, bool force)
{ {
struct drm_atomic_state *state = NULL; struct drm_atomic_state *state = NULL;
uint64_t reset_flags = 0; uint64_t reset_flags = 0;
......
...@@ -693,7 +693,7 @@ static int amdgpu_debugfs_gpu_recover(struct seq_file *m, void *data) ...@@ -693,7 +693,7 @@ static int amdgpu_debugfs_gpu_recover(struct seq_file *m, void *data)
struct amdgpu_device *adev = dev->dev_private; struct amdgpu_device *adev = dev->dev_private;
seq_printf(m, "gpu recover\n"); seq_printf(m, "gpu recover\n");
amdgpu_gpu_recover(adev, NULL, true); amdgpu_device_gpu_recover(adev, NULL, true);
return 0; return 0;
} }
......
...@@ -88,7 +88,7 @@ static void amdgpu_irq_reset_work_func(struct work_struct *work) ...@@ -88,7 +88,7 @@ static void amdgpu_irq_reset_work_func(struct work_struct *work)
reset_work); reset_work);
if (!amdgpu_sriov_vf(adev)) if (!amdgpu_sriov_vf(adev))
amdgpu_gpu_recover(adev, NULL, false); amdgpu_device_gpu_recover(adev, NULL, false);
} }
/* Disable *all* interrupts */ /* Disable *all* interrupts */
......
...@@ -37,7 +37,7 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job) ...@@ -37,7 +37,7 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)
atomic_read(&job->ring->fence_drv.last_seq), atomic_read(&job->ring->fence_drv.last_seq),
job->ring->fence_drv.sync_seq); job->ring->fence_drv.sync_seq);
amdgpu_gpu_recover(job->adev, job, false); amdgpu_device_gpu_recover(job->adev, job, false);
} }
int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs, int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
......
...@@ -253,7 +253,7 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work) ...@@ -253,7 +253,7 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work)
} }
/* Trigger recovery due to world switch failure */ /* Trigger recovery due to world switch failure */
amdgpu_gpu_recover(adev, NULL, false); amdgpu_device_gpu_recover(adev, NULL, false);
} }
static int xgpu_ai_set_mailbox_rcv_irq(struct amdgpu_device *adev, static int xgpu_ai_set_mailbox_rcv_irq(struct amdgpu_device *adev,
......
...@@ -521,7 +521,7 @@ static void xgpu_vi_mailbox_flr_work(struct work_struct *work) ...@@ -521,7 +521,7 @@ static void xgpu_vi_mailbox_flr_work(struct work_struct *work)
} }
/* Trigger recovery due to world switch failure */ /* Trigger recovery due to world switch failure */
amdgpu_gpu_recover(adev, NULL, false); amdgpu_device_gpu_recover(adev, NULL, false);
} }
static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev, static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment