drm/amdkfd: Stop using get_vmem_size KGD-KFD interface

get_vmem_size() is deprecated. Instead use get_local_mem_info().

Signed-off-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Signed-off-by: Ben Goz <ben.goz@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 9d03a56..cb0303a 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1073,11 +1073,15 @@ static uint32_t kfd_generate_gpu_id(struct kfd_dev *gpu)
        uint32_t buf[7];
        uint64_t local_mem_size;
        int i;
        uint32_t buf[7];
        uint64_t local_mem_size;
        int i;

+       struct kfd_local_mem_info local_mem_info;

 
        if (!gpu)
                return 0;
 
 
        if (!gpu)
                return 0;
 

-       local_mem_size = gpu->kfd2kgd->get_vmem_size(gpu->kgd);
+       gpu->kfd2kgd->get_local_mem_info(gpu->kgd, &local_mem_info);
+
+       local_mem_size = local_mem_info.local_mem_size_private +
+                       local_mem_info.local_mem_size_public;

 
        buf[0] = gpu->pdev->devfn;
        buf[1] = gpu->pdev->subsystem_vendor;
 
        buf[0] = gpu->pdev->devfn;
        buf[1] = gpu->pdev->subsystem_vendor;