aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
diff options
context:
space:
mode:
authorpding <Pixel.Ding@amd.com>2017-11-05 21:21:26 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-12-04 16:41:44 -0500
commit1884734a03904d23137a075c9b64cd9871af1914 (patch)
treea9b04ee783df1bf0563c515a4869c56e3b799e06 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
parent40575732b6a2ad6430ad8056dabe4cdc01224534 (diff)
drm/amdkfd: initialise kfd inside amdgpu_device_init
Also finalize kfd inside amdgpu_device_fini. kfd device_init needs SRIOV exclusive accessing. Try to gather exclusive accessing to reduce time consuming. Signed-off-by: pding <Pixel.Ding@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index f313eee60c4a..252d41d5ff56 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -63,8 +63,6 @@ void amdgpu_driver_unload_kms(struct drm_device *dev)
63 pm_runtime_forbid(dev->dev); 63 pm_runtime_forbid(dev->dev);
64 } 64 }
65 65
66 amdgpu_amdkfd_device_fini(adev);
67
68 amdgpu_acpi_fini(adev); 66 amdgpu_acpi_fini(adev);
69 67
70 amdgpu_device_fini(adev); 68 amdgpu_device_fini(adev);
@@ -170,9 +168,6 @@ retry_init:
170 "Error during ACPI methods call\n"); 168 "Error during ACPI methods call\n");
171 } 169 }
172 170
173 amdgpu_amdkfd_device_probe(adev);
174 amdgpu_amdkfd_device_init(adev);
175
176 if (amdgpu_device_is_px(dev)) { 171 if (amdgpu_device_is_px(dev)) {
177 pm_runtime_use_autosuspend(dev->dev); 172 pm_runtime_use_autosuspend(dev->dev);
178 pm_runtime_set_autosuspend_delay(dev->dev, 5000); 173 pm_runtime_set_autosuspend_delay(dev->dev, 5000);