Commit 714d9e45 authored Sep 28, 2021 by Yifan Zhang Committed by Alex Deucher Oct 05, 2021

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 <yifan1.zhang@amd.com>
Reviewed-by: James Zhu <James.Zhu@amd.com>
Tested-by: James Zhu <James.Zhu@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 0dd10a96

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -2394,10 +2394,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
		if (r)
		goto init_failed;

		r = amdgpu_amdkfd_resume_iommu(adev);
		if (r)
		goto init_failed;

		r = amdgpu_device_ip_hw_init_phase1(adev);
		if (r)
		goto init_failed;
		@@ -2436,6 +2432,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
		if (!adev->gmc.xgmi.pending_reset)
		amdgpu_amdkfd_device_init(adev);

		r = amdgpu_amdkfd_resume_iommu(adev);
		if (r)
		goto init_failed;

		amdgpu_fru_get_product_info(adev);

		init_failed: