Skip to content

Commit 714d9e4

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 0dd10a9 commit 714d9e4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2394,10 +2394,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
23942394
if (r)
23952395
goto init_failed;
23962396

2397-
r = amdgpu_amdkfd_resume_iommu(adev);
2398-
if (r)
2399-
goto init_failed;
2400-
24012397
r = amdgpu_device_ip_hw_init_phase1(adev);
24022398
if (r)
24032399
goto init_failed;
@@ -2436,6 +2432,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
24362432
if (!adev->gmc.xgmi.pending_reset)
24372433
amdgpu_amdkfd_device_init(adev);
24382434

2435+
r = amdgpu_amdkfd_resume_iommu(adev);
2436+
if (r)
2437+
goto init_failed;
2438+
24392439
amdgpu_fru_get_product_info(adev);
24402440

24412441
init_failed:

0 commit comments

Comments
 (0)