drm/amdgpu: Do not access members of xcp w/o check (v2)

Not all the asic needs xcp. ensure check xcp availabity
before accessing its member.

v2: add missing change in kfd_topology.c

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Le Ma <le.ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 85df73f2c85edc4dcfb2b84ee59ddfdb03b7b225..739eb7c0d133ba0db0f887cd5f7c82123d587272 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -429,17 +429,17 @@ uint32_t amdgpu_amdkfd_get_fw_version(struct amdgpu_device *adev,
 
 void amdgpu_amdkfd_get_local_mem_info(struct amdgpu_device *adev,
                                      struct kfd_local_mem_info *mem_info,
-                                     uint8_t xcp_id)
+                                     struct amdgpu_xcp *xcp)
 {
        memset(mem_info, 0, sizeof(*mem_info));
 
-       if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 3)) {
+       if (xcp) {
                if (adev->gmc.real_vram_size == adev->gmc.visible_vram_size)
                        mem_info->local_mem_size_public =
-                                       KFD_XCP_MEMORY_SIZE(adev, xcp_id);
+                                       KFD_XCP_MEMORY_SIZE(adev, xcp->id);
                else
                        mem_info->local_mem_size_private =
-                                       KFD_XCP_MEMORY_SIZE(adev, xcp_id);
+                                       KFD_XCP_MEMORY_SIZE(adev, xcp->id);
        } else {
                mem_info->local_mem_size_public = adev->gmc.visible_vram_size;
                mem_info->local_mem_size_private = adev->gmc.real_vram_size -

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 48d12dbff968134359527f8549fa659fd2e7cb6b..be43d71ba7ef46edd9d7bc2b177025099f7bcebf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -233,7 +233,7 @@ uint32_t amdgpu_amdkfd_get_fw_version(struct amdgpu_device *adev,
                                      enum kgd_engine_type type);
 void amdgpu_amdkfd_get_local_mem_info(struct amdgpu_device *adev,
                                      struct kfd_local_mem_info *mem_info,
-                                     uint8_t xcp_id);
+                                     struct amdgpu_xcp *xcp);
 uint64_t amdgpu_amdkfd_get_gpu_clock_counter(struct amdgpu_device *adev);
 
 uint32_t amdgpu_amdkfd_get_max_engine_clock_in_mhz(struct amdgpu_device *adev);

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 2cfef3f9456f10163aee8739fd63958b6d3d3a3c..986543a000bf5f570fb4a7bdff5883a5acb932d6 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -784,7 +784,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
                atomic_set(&node->sram_ecc_flag, 0);
 
                amdgpu_amdkfd_get_local_mem_info(kfd->adev,
-                                       &node->local_mem_info, node->xcp->id);
+                                       &node->local_mem_info, node->xcp);
 
                /* Initialize the KFD node */
                if (kfd_init_node(node)) {

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index e0bacf017a405039af1a022a34bfb22a895f2ae3..8302d8967158bdfb53dcedff801b8dcf3e0c9e2e 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1235,7 +1235,7 @@ static void kfd_fill_mem_clk_max_info(struct kfd_topology_device *dev)
         *      all the banks will report the same mem_clk_max information
         */
        amdgpu_amdkfd_get_local_mem_info(dev->gpu->adev, &local_mem_info,
-                                        dev->gpu->xcp->id);
+                                        dev->gpu->xcp);
 
        list_for_each_entry(mem, &dev->mem_props, list)
                mem->mem_clk_max = local_mem_info.mem_clk_max;