Skip to content

Commit 286826d

Browse files
yifancomalexdeucher
authored andcommitted
drm/amdgpu: init iommu after amdkfd device init
This patch is to fix clinfo failure in Raven/Picasso: Number of platforms: 1 Platform Profile: FULL_PROFILE Platform Version: OpenCL 2.2 AMD-APP (3364.0) Platform Name: AMD Accelerated Parallel Processing Platform Vendor: Advanced Micro Devices, Inc. Platform Extensions: cl_khr_icd cl_amd_event_callback Platform Name: AMD Accelerated Parallel Processing Number of devices: 0 Signed-off-by: Yifan Zhang <[email protected]> Reviewed-by: James Zhu <[email protected]> Tested-by: James Zhu <[email protected]> Acked-by: Felix Kuehling <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 499f4d3 commit 286826d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -2360,10 +2360,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
23602360
if (r)
23612361
goto init_failed;
23622362

2363-
r = amdgpu_amdkfd_resume_iommu(adev);
2364-
if (r)
2365-
goto init_failed;
2366-
23672363
r = amdgpu_device_ip_hw_init_phase1(adev);
23682364
if (r)
23692365
goto init_failed;
@@ -2402,6 +2398,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
24022398
if (!adev->gmc.xgmi.pending_reset)
24032399
amdgpu_amdkfd_device_init(adev);
24042400

2401+
r = amdgpu_amdkfd_resume_iommu(adev);
2402+
if (r)
2403+
goto init_failed;
2404+
24052405
amdgpu_fru_get_product_info(adev);
24062406

24072407
init_failed:

0 commit comments

Comments
 (0)