drm/amdgpu/sriov: For finishing routine send rel event after init failed
Subsystems (2)
PATCH 1/1 drm/amdgpu/sriov: For finishing routine send rel event after init failed
When init fail, sendsend rel init, req_fini and rel_fini to host for the finishing routine.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +15 -11
@@ -1652,7 +1652,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)if (r) {DRM_ERROR ("sw_init of IP block <%s> failed %d\n" , adev->ip_blocks[i].version->funcs->name, r); -return r; + goto init_failed; } adev->ip_blocks[i].status.sw = true;
@@ -1661,17 +1661,17 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) r =amdgpu_device_vram_scratch_init (adev);if (r) {DRM_ERROR ("amdgpu_vram_scratch_init failed %d\n" , r); -return r; + goto init_failed; } r = adev->ip_blocks[i].version->funcs->hw_init ((void *)adev);if (r) {DRM_ERROR ("hw_init %d failed %d\n" , i, r); -return r; + goto init_failed; } r =amdgpu_device_wb_init (adev);if (r) {DRM_ERROR ("amdgpu_device_wb_init failed %d\n" , r); -return r; + goto init_failed; } adev->ip_blocks[i].status.hw = true;
@@ -1682,7 +1682,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) AMDGPU_CSA_SIZE);if (r) {DRM_ERROR ("allocate CSA failed %d\n" , r); -return r; + goto init_failed; } } }
@@ -1690,30 +1690,32 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) r =amdgpu_ucode_create_bo (adev);/* create ucode bo when sw_init complete*/ if (r) -return r; + goto init_failed; r =amdgpu_device_ip_hw_init_phase1 (adev);if (r) -return r; + goto init_failed; r =amdgpu_device_fw_loading (adev);if (r) -return r; + goto init_failed; r =amdgpu_device_ip_hw_init_phase2 (adev);if (r) -return r; + goto init_failed;if (adev->gmc.xgmi.num_physical_nodes >1 )amdgpu_xgmi_add_device (adev);amdgpu_amdkfd_device_init (adev); +init_failed:if (amdgpu_sriov_vf (adev)) { -amdgpu_virt_init_data_exchange (adev); +if (!r) +amdgpu_virt_init_data_exchange (adev);amdgpu_virt_release_full_gpu (adev, true); } -return 0 ; +return r; }/**
@@ -2621,6 +2623,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, }dev_err (adev->dev,"amdgpu_device_ip_init failed\n" );amdgpu_vf_error_put (adev,AMDGIM_ERROR_VF_AMDGPU_INIT_FAIL ,0 ,0 ); +if (amdgpu_virt_request_full_gpu (adev, false)) +amdgpu_virt_release_full_gpu (adev, false); goto failed; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1546487917-17799-1-git-send-email-Emily.Deng-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Emily Deng <[email protected]>
Sent: Wednesday, January 2, 2019 10:58:37 PM
To: [email protected]
Cc: Deng, Emily
Subject: [PATCH] drm/amdgpu/sriov: For finishing routine send rel event after init failed
When init fail, sendsend rel init, req_fini and rel_fini to host for the finishing routine.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +15 -11
@@ -1652,7 +1652,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)if (r) {DRM_ERROR ("sw_init of IP block <%s> failed %d\n" , adev->ip_blocks[i].version->funcs->name, r); -return r; + goto init_failed; } adev->ip_blocks[i].status.sw = true;
@@ -1661,17 +1661,17 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) r =amdgpu_device_vram_scratch_init (adev);if (r) {DRM_ERROR ("amdgpu_vram_scratch_init failed %d\n" , r); -return r; + goto init_failed; } r = adev->ip_blocks[i].version->funcs->hw_init ((void *)adev);if (r) {DRM_ERROR ("hw_init %d failed %d\n" , i, r); -return r; + goto init_failed; } r =amdgpu_device_wb_init (adev);if (r) {DRM_ERROR ("amdgpu_device_wb_init failed %d\n" , r); -return r; + goto init_failed; } adev->ip_blocks[i].status.hw = true;
@@ -1682,7 +1682,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) AMDGPU_CSA_SIZE);if (r) {DRM_ERROR ("allocate CSA failed %d\n" , r); -return r; + goto init_failed; } } }
@@ -1690,30 +1690,32 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) r =amdgpu_ucode_create_bo (adev);/* create ucode bo when sw_init complete*/ if (r) -return r; + goto init_failed; r =amdgpu_device_ip_hw_init_phase1 (adev);if (r) -return r; + goto init_failed; r =amdgpu_device_fw_loading (adev);if (r) -return r; + goto init_failed; r =amdgpu_device_ip_hw_init_phase2 (adev);if (r) -return r; + goto init_failed;if (adev->gmc.xgmi.num_physical_nodes >1 )amdgpu_xgmi_add_device (adev);amdgpu_amdkfd_device_init (adev); +init_failed:if (amdgpu_sriov_vf (adev)) { -amdgpu_virt_init_data_exchange (adev); +if (!r) +amdgpu_virt_init_data_exchange (adev);amdgpu_virt_release_full_gpu (adev, true); } -return 0 ; +return r; }/**
@@ -2621,6 +2623,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, }dev_err (adev->dev,"amdgpu_device_ip_init failed\n" );amdgpu_vf_error_put (adev,AMDGIM_ERROR_VF_AMDGPU_INIT_FAIL ,0 ,0 ); +if (amdgpu_virt_request_full_gpu (adev, false)) +amdgpu_virt_release_full_gpu (adev, false); goto failed; }
--
2.7.4
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx