drm/amdgpu: Move amdgpu_device_check_iommu_direct_map() earlier

So device init ram_is_direct_mapped is available when gmc_funcs are selected
during IP early init.

Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 7aa604fd94902bc420196076d8a7a825f6fb51c5..681af0d2be3bb7c0a2b80dc5a3cd866feeaee912 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3858,6 +3858,9 @@ int amdgpu_device_init(struct amdgpu_device *adev,
         * completed before the need for a different level is detected.
         */
        amdgpu_set_init_level(adev, AMDGPU_INIT_LEVEL_DEFAULT);
+
+       amdgpu_device_check_iommu_direct_map(adev);
+
        /* early init functions */
        r = amdgpu_device_ip_early_init(adev);
        if (r)
@@ -4115,8 +4118,6 @@ fence_driver_init:
        if (px)
                vga_switcheroo_init_domain_pm_ops(adev->dev, &adev->vga_pm_domain);
 
-       amdgpu_device_check_iommu_direct_map(adev);
-
        adev->pm_nb.notifier_call = amdgpu_device_pm_notifier;
        r = register_pm_notifier(&adev->pm_nb);
        if (r)