4 files changed, 17 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 84d68d658f8a..44ba8bed1b29 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -70,7 +70,7 @@ bool amdgpu_amdkfd_load_interface(struct amdgpu_device *rdev)
                 return false;
         }
 
-        if (!kgd2kfd_init_p(KFD_INTERFACE_VERSION, &kgd2kfd)) {
+        if (kgd2kfd_init_p(KFD_INTERFACE_VERSION, &kgd2kfd)) {
                 symbol_put(kgd2kfd_init);
                 kfd2kgd = NULL;
                 kgd2kfd = NULL;
@@ -80,7 +80,7 @@ bool amdgpu_amdkfd_load_interface(struct amdgpu_device *rdev)
 
         return true;
 #elif defined(CONFIG_HSA_AMD)
-        if (!kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd)) {
+        if (kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd)) {
                 kfd2kgd = NULL;
                 kgd2kfd = NULL;
                 return false;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_module.c b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
index ca8410e8683d..850a5623661f 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_module.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
@@ -59,18 +59,23 @@ module_param(send_sigterm, int, 0444);
 MODULE_PARM_DESC(send_sigterm,
         "Send sigterm to HSA process on unhandled exception (0 = disable, 1 = enable)");
 
-bool kgd2kfd_init(unsigned interface_version, const struct kgd2kfd_calls **g2f)
+static int amdkfd_init_completed;
+
+int kgd2kfd_init(unsigned interface_version, const struct kgd2kfd_calls **g2f)
 {
+        if (!amdkfd_init_completed)
+                return -EPROBE_DEFER;
+
         /*
          * Only one interface version is supported,
          * no kfd/kgd version skew allowed.
          */
         if (interface_version != KFD_INTERFACE_VERSION)
-                return false;
+                return -EINVAL;
 
         *g2f = &kgd2kfd;
 
-        return true;
+        return 0;
 }
 EXPORT_SYMBOL(kgd2kfd_init);
 
@@ -111,6 +116,8 @@ static int __init kfd_module_init(void)
 
         kfd_process_create_wq();
 
+        amdkfd_init_completed = 1;
+
         dev_info(kfd_device, "Initialized module\n");
 
         return 0;
@@ -125,6 +132,8 @@ err_pasid:
 
 static void __exit kfd_module_exit(void)
 {
+        amdkfd_init_completed = 0;
+
         kfd_process_destroy_wq();
         kfd_topology_shutdown();
         kfd_chardev_exit();
diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
index 888250b33ea8..a09d9f352871 100644
--- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
+++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
@@ -221,7 +221,7 @@ struct kgd2kfd_calls {
         int (*resume)(struct kfd_dev *kfd);
 };
 
-bool kgd2kfd_init(unsigned interface_version,
+int kgd2kfd_init(unsigned interface_version,
                 const struct kgd2kfd_calls **g2f);
 
 #endif  /* KGD_KFD_INTERFACE_H_INCLUDED */
diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c
index 9a4d69e59401..83c2704a7291 100644
--- a/drivers/gpu/drm/radeon/radeon_kfd.c
+++ b/drivers/gpu/drm/radeon/radeon_kfd.c
@@ -142,7 +142,7 @@ bool radeon_kfd_init(void)
         if (kgd2kfd_init_p == NULL)
                 return false;
 
-        if (!kgd2kfd_init_p(KFD_INTERFACE_VERSION, &kgd2kfd)) {
+        if (kgd2kfd_init_p(KFD_INTERFACE_VERSION, &kgd2kfd)) {
                 symbol_put(kgd2kfd_init);
                 kgd2kfd = NULL;
 
@@ -151,7 +151,7 @@ bool radeon_kfd_init(void)
 
         return true;
 #elif defined(CONFIG_HSA_AMD)
-        if (!kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd)) {
+        if (kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd)) {
                 kgd2kfd = NULL;
 
                 return false;