drm/amdgpu: Fix handling of KFD initialization failures

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_amdkfd.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index edff1b7..53d5aa2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -36,6 +36,8 @@
  */
 uint64_t amdgpu_amdkfd_total_mem_size;
 
+bool kfd_initialized;
+
 int amdgpu_amdkfd_init(void)
 {
        struct sysinfo si;
@@ -51,19 +53,26 @@ int amdgpu_amdkfd_init(void)
 #else
        ret = -ENOENT;
 #endif
+       kfd_initialized = !ret;
 
        return ret;
 }
 
 void amdgpu_amdkfd_fini(void)
 {
-       kgd2kfd_exit();
+       if (kfd_initialized) {
+               kgd2kfd_exit();
+               kfd_initialized = false;
+       }
 }
 
 void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev)
 {
        bool vf = amdgpu_sriov_vf(adev);
 
+       if (!kfd_initialized)
+               return;
+
        adev->kfd.dev = kgd2kfd_probe((struct kgd_dev *)adev,
                                      adev->pdev, adev->asic_type, vf);