1 files changed, 49 insertions, 44 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 0c791e35acf0..c31a8849e9f8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -28,7 +28,6 @@
 #include <linux/module.h>
 
 const struct kgd2kfd_calls *kgd2kfd;
-bool (*kgd2kfd_init_p)(unsigned int, const struct kgd2kfd_calls**);
 
 static const unsigned int compute_vmid_bitmap = 0xFF00;
 
@@ -36,45 +35,23 @@ int amdgpu_amdkfd_init(void)
 {
         int ret;
 
-#if defined(CONFIG_HSA_AMD_MODULE)
-        int (*kgd2kfd_init_p)(unsigned int, const struct kgd2kfd_calls**);
-
-        kgd2kfd_init_p = symbol_request(kgd2kfd_init);
-
-        if (kgd2kfd_init_p == NULL)
-                return -ENOENT;
-
-        ret = kgd2kfd_init_p(KFD_INTERFACE_VERSION, &kgd2kfd);
-        if (ret) {
-                symbol_put(kgd2kfd_init);
-                kgd2kfd = NULL;
-        }
-
-
-#elif defined(CONFIG_HSA_AMD)
-
+#ifdef CONFIG_HSA_AMD
         ret = kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd);
         if (ret)
                 kgd2kfd = NULL;
-
+        amdgpu_amdkfd_gpuvm_init_mem_limits();
 #else
         kgd2kfd = NULL;
         ret = -ENOENT;
 #endif
 
-#if defined(CONFIG_HSA_AMD_MODULE) || defined(CONFIG_HSA_AMD)
-        amdgpu_amdkfd_gpuvm_init_mem_limits();
-#endif
-
         return ret;
 }
 
 void amdgpu_amdkfd_fini(void)
 {
-        if (kgd2kfd) {
+        if (kgd2kfd)
                 kgd2kfd->exit();
-                symbol_put(kgd2kfd_init);
-        }
 }
 
 void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev)
@@ -99,6 +76,7 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev)
                 kfd2kgd = amdgpu_amdkfd_gfx_8_0_get_functions();
                 break;
         case CHIP_VEGA10:
+        case CHIP_VEGA20:
         case CHIP_RAVEN:
                 kfd2kgd = amdgpu_amdkfd_gfx_9_0_get_functions();
                 break;
@@ -146,7 +124,7 @@ static void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,
 
 void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
 {
-        int i;
+        int i, n;
         int last_valid_bit;
         if (adev->kfd) {
                 struct kgd2kfd_shared_resources gpu_resources = {
@@ -155,7 +133,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
                         .num_queue_per_pipe = adev->gfx.mec.num_queue_per_pipe,
                         .gpuvm_size = min(adev->vm_manager.max_pfn
                                           << AMDGPU_GPU_PAGE_SHIFT,
-                                          AMDGPU_VA_HOLE_START),
+                                          AMDGPU_GMC_HOLE_START),
                         .drm_render_minor = adev->ddev->render->index
                 };
 
@@ -185,7 +163,15 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
                                 &gpu_resources.doorbell_physical_address,
                                 &gpu_resources.doorbell_aperture_size,
                                 &gpu_resources.doorbell_start_offset);
-                if (adev->asic_type >= CHIP_VEGA10) {
+
+                if (adev->asic_type < CHIP_VEGA10) {
+                        kgd2kfd->device_init(adev->kfd, &gpu_resources);
+                        return;
+                }
+
+                n = (adev->asic_type < CHIP_VEGA20) ? 2 : 8;
+
+                for (i = 0; i < n; i += 2) {
                         /* On SOC15 the BIF is involved in routing
                          * doorbells using the low 12 bits of the
                          * address. Communicate the assignments to
@@ -193,20 +179,31 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
                          * process in case of 64-bit doorbells so we
                          * can use each doorbell assignment twice.
                          */
-                        gpu_resources.sdma_doorbell[0][0] =
-                                AMDGPU_DOORBELL64_sDMA_ENGINE0;
-                        gpu_resources.sdma_doorbell[0][1] =
-                                AMDGPU_DOORBELL64_sDMA_ENGINE0 + 0x200;
-                        gpu_resources.sdma_doorbell[1][0] =
-                                AMDGPU_DOORBELL64_sDMA_ENGINE1;
-                        gpu_resources.sdma_doorbell[1][1] =
-                                AMDGPU_DOORBELL64_sDMA_ENGINE1 + 0x200;
-                        /* Doorbells 0x0f0-0ff and 0x2f0-2ff are reserved for
-                         * SDMA, IH and VCN. So don't use them for the CP.
-                         */
-                        gpu_resources.reserved_doorbell_mask = 0x1f0;
-                        gpu_resources.reserved_doorbell_val  = 0x0f0;
+                        if (adev->asic_type == CHIP_VEGA10) {
+                                gpu_resources.sdma_doorbell[0][i] =
+                                        AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 + (i >> 1);
+                                gpu_resources.sdma_doorbell[0][i+1] =
+                                        AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 + 0x200 + (i >> 1);
+                                gpu_resources.sdma_doorbell[1][i] =
+                                        AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 + (i >> 1);
+                                gpu_resources.sdma_doorbell[1][i+1] =
+                                        AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1 + 0x200 + (i >> 1);
+                        } else {
+                                gpu_resources.sdma_doorbell[0][i] =
+                                        AMDGPU_DOORBELL64_sDMA_ENGINE0 + (i >> 1);
+                                gpu_resources.sdma_doorbell[0][i+1] =
+                                        AMDGPU_DOORBELL64_sDMA_ENGINE0 + 0x200 + (i >> 1);
+                                gpu_resources.sdma_doorbell[1][i] =
+                                        AMDGPU_DOORBELL64_sDMA_ENGINE1 + (i >> 1);
+                                gpu_resources.sdma_doorbell[1][i+1] =
+                                        AMDGPU_DOORBELL64_sDMA_ENGINE1 + 0x200 + (i >> 1);
+                        }
                 }
+                /* Doorbells 0x0e0-0ff and 0x2e0-2ff are reserved for
+                 * SDMA, IH and VCN. So don't use them for the CP.
+                 */
+                gpu_resources.reserved_doorbell_mask = 0x1e0;
+                gpu_resources.reserved_doorbell_val  = 0x0e0;
 
                 kgd2kfd->device_init(adev->kfd, &gpu_resources);
         }
@@ -267,7 +264,8 @@ void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd)
 {
         struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
 
-        amdgpu_device_gpu_recover(adev, NULL, false);
+        if (amdgpu_device_should_recover_gpu(adev))
+                amdgpu_device_gpu_recover(adev, NULL);
 }
 
 int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
@@ -437,6 +435,13 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd)
         return amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
 }
 
+uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd)
+{
+        struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
+
+        return adev->gmc.xgmi.hive_id;
+}
+
 int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,