diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 386a7b34d2f4..9b8264c761f7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -2004,7 +2004,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) | |||
2004 | continue; | 2004 | continue; |
2005 | 2005 | ||
2006 | r = block->version->funcs->hw_init(adev); | 2006 | r = block->version->funcs->hw_init(adev); |
2007 | DRM_INFO("RE-INIT: %s %s\n", block->version->funcs->name, r?"failed":"successed"); | 2007 | DRM_INFO("RE-INIT: %s %s\n", block->version->funcs->name, r?"failed":"succeeded"); |
2008 | if (r) | 2008 | if (r) |
2009 | return r; | 2009 | return r; |
2010 | } | 2010 | } |
@@ -2039,7 +2039,7 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) | |||
2039 | continue; | 2039 | continue; |
2040 | 2040 | ||
2041 | r = block->version->funcs->hw_init(adev); | 2041 | r = block->version->funcs->hw_init(adev); |
2042 | DRM_INFO("RE-INIT: %s %s\n", block->version->funcs->name, r?"failed":"successed"); | 2042 | DRM_INFO("RE-INIT: %s %s\n", block->version->funcs->name, r?"failed":"succeeded"); |
2043 | if (r) | 2043 | if (r) |
2044 | return r; | 2044 | return r; |
2045 | } | 2045 | } |
@@ -3091,7 +3091,7 @@ static int amdgpu_device_handle_vram_lost(struct amdgpu_device *adev) | |||
3091 | * @adev: amdgpu device pointer | 3091 | * @adev: amdgpu device pointer |
3092 | * | 3092 | * |
3093 | * attempt to do soft-reset or full-reset and reinitialize Asic | 3093 | * attempt to do soft-reset or full-reset and reinitialize Asic |
3094 | * return 0 means successed otherwise failed | 3094 | * return 0 means succeeded otherwise failed |
3095 | */ | 3095 | */ |
3096 | static int amdgpu_device_reset(struct amdgpu_device *adev) | 3096 | static int amdgpu_device_reset(struct amdgpu_device *adev) |
3097 | { | 3097 | { |
@@ -3169,7 +3169,7 @@ out: | |||
3169 | * @from_hypervisor: request from hypervisor | 3169 | * @from_hypervisor: request from hypervisor |
3170 | * | 3170 | * |
3171 | * do VF FLR and reinitialize Asic | 3171 | * do VF FLR and reinitialize Asic |
3172 | * return 0 means successed otherwise failed | 3172 | * return 0 means succeeded otherwise failed |
3173 | */ | 3173 | */ |
3174 | static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, | 3174 | static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, |
3175 | bool from_hypervisor) | 3175 | bool from_hypervisor) |
@@ -3294,7 +3294,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, | |||
3294 | dev_info(adev->dev, "GPU reset(%d) failed\n", atomic_read(&adev->gpu_reset_counter)); | 3294 | dev_info(adev->dev, "GPU reset(%d) failed\n", atomic_read(&adev->gpu_reset_counter)); |
3295 | amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_GPU_RESET_FAIL, 0, r); | 3295 | amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_GPU_RESET_FAIL, 0, r); |
3296 | } else { | 3296 | } else { |
3297 | dev_info(adev->dev, "GPU reset(%d) successed!\n",atomic_read(&adev->gpu_reset_counter)); | 3297 | dev_info(adev->dev, "GPU reset(%d) succeeded!\n",atomic_read(&adev->gpu_reset_counter)); |
3298 | } | 3298 | } |
3299 | 3299 | ||
3300 | amdgpu_vf_error_trans_all(adev); | 3300 | amdgpu_vf_error_trans_all(adev); |