drm/amdgpu: Remove kgd2kfd function pointers

kgd2kfd function pointers and global kgd2kfd pointer are no longer in use.

Signed-off-by: Amber Lin <Amber.Lin@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

4 files changed, 4 insertions, 85 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index fc926e2f857a..612887cd40cd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -28,8 +28,6 @@
 #include <linux/module.h>
 #include <linux/dma-buf.h>
 
-const struct kgd2kfd_calls *kgd2kfd;
-
 static const unsigned int compute_vmid_bitmap = 0xFF00;
 
 /* Total memory size in system memory and all GPU VRAM. Used to
@@ -47,12 +45,9 @@ int amdgpu_amdkfd_init(void)
         amdgpu_amdkfd_total_mem_size *= si.mem_unit;
 
 #ifdef CONFIG_HSA_AMD
-        ret = kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd);
-        if (ret)
-                kgd2kfd = NULL;
+        ret = kgd2kfd_init();
         amdgpu_amdkfd_gpuvm_init_mem_limits();
 #else
-        kgd2kfd = NULL;
         ret = -ENOENT;
 #endif
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 3214d319071b..0b31a1859023 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -214,8 +214,7 @@ void amdgpu_amdkfd_gpuvm_init_mem_limits(void);
 void amdgpu_amdkfd_unreserve_memory_limit(struct amdgpu_bo *bo);
 
 /* KGD2KFD callbacks */
-int kgd2kfd_init(unsigned interface_version,
-                 const struct kgd2kfd_calls **g2f);
+int kgd2kfd_init(void);
 void kgd2kfd_exit(void);
 struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct pci_dev *pdev,
                               const struct kfd2kgd_calls *f2g);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_module.c b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
index 030b39d62973..932007eb9168 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_module.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
@@ -25,22 +25,6 @@
 #include "kfd_priv.h"
 #include "amdgpu_amdkfd.h"
 
-static const struct kgd2kfd_calls kgd2kfd = {
-        .exit           = kgd2kfd_exit,
-        .probe          = kgd2kfd_probe,
-        .device_init    = kgd2kfd_device_init,
-        .device_exit    = kgd2kfd_device_exit,
-        .interrupt      = kgd2kfd_interrupt,
-        .suspend        = kgd2kfd_suspend,
-        .resume         = kgd2kfd_resume,
-        .quiesce_mm     = kgd2kfd_quiesce_mm,
-        .resume_mm      = kgd2kfd_resume_mm,
-        .schedule_evict_and_restore_process =
-                          kgd2kfd_schedule_evict_and_restore_process,
-        .pre_reset      = kgd2kfd_pre_reset,
-        .post_reset     = kgd2kfd_post_reset,
-};
-
 static int kfd_init(void)
 {
         int err;
@@ -92,18 +76,9 @@ static void kfd_exit(void)
         kfd_chardev_exit();
 }
 
-int kgd2kfd_init(unsigned int interface_version,
-                const struct kgd2kfd_calls **g2f)
+int kgd2kfd_init()
 {
-        int err;
-
-        err = kfd_init();
-        if (err)
-                return err;
-
-        *g2f = &kgd2kfd;
-
-        return 0;
+        return kfd_init();
 }
 
 void kgd2kfd_exit(void)
diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
index 3d5c3b00d917..83d960110d23 100644
--- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
+++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
@@ -34,7 +34,6 @@
 
 struct pci_dev;
 
-#define KFD_INTERFACE_VERSION 2
 #define KGD_MAX_QUEUES 128
 
 struct kfd_dev;
@@ -330,53 +329,4 @@ struct kfd2kgd_calls {
 
 };
 
-/**
- * struct kgd2kfd_calls
- *
- * @exit: Notifies amdkfd that kgd module is unloaded
- *
- * @probe: Notifies amdkfd about a probe done on a device in the kgd driver.
- *
- * @device_init: Initialize the newly probed device (if it is a device that
- * amdkfd supports)
- *
- * @device_exit: Notifies amdkfd about a removal of a kgd device
- *
- * @suspend: Notifies amdkfd about a suspend action done to a kgd device
- *
- * @resume: Notifies amdkfd about a resume action done to a kgd device
- *
- * @quiesce_mm: Quiesce all user queue access to specified MM address space
- *
- * @resume_mm: Resume user queue access to specified MM address space
- *
- * @schedule_evict_and_restore_process: Schedules work queue that will prepare
- * for safe eviction of KFD BOs that belong to the specified process.
- *
- * @pre_reset: Notifies amdkfd that amdgpu about to reset the gpu
- *
- * @post_reset: Notify amdkfd that amgpu successfully reseted the gpu
- *
- * This structure contains function callback pointers so the kgd driver
- * will notify to the amdkfd about certain status changes.
- *
- */
-struct kgd2kfd_calls {
-        void (*exit)(void);
-        struct kfd_dev* (*probe)(struct kgd_dev *kgd, struct pci_dev *pdev,
-                const struct kfd2kgd_calls *f2g);
-        bool (*device_init)(struct kfd_dev *kfd,
-                        const struct kgd2kfd_shared_resources *gpu_resources);
-        void (*device_exit)(struct kfd_dev *kfd);
-        void (*interrupt)(struct kfd_dev *kfd, const void *ih_ring_entry);
-        void (*suspend)(struct kfd_dev *kfd);
-        int (*resume)(struct kfd_dev *kfd);
-        int (*quiesce_mm)(struct mm_struct *mm);
-        int (*resume_mm)(struct mm_struct *mm);
-        int (*schedule_evict_and_restore_process)(struct mm_struct *mm,
-                        struct dma_fence *fence);
-        int  (*pre_reset)(struct kfd_dev *kfd);
-        int  (*post_reset)(struct kfd_dev *kfd);
-};
-
 #endif  /* KGD_KFD_INTERFACE_H_INCLUDED */