drm/amdkfd: Report SDMA firmware version in the topology

Also save the version in struct kfd_dev so we only need to query
it once.

Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index b5095c0b4f5aa59aa4e00f0d5091027c6b86e33c..4f7c0a79bbf533c94481ae8dea03ca19a5740a0d 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -405,6 +405,10 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
 {
        unsigned int size;
 
+       kfd->mec_fw_version = kfd->kfd2kgd->get_fw_version(kfd->kgd,
+                       KGD_ENGINE_MEC1);
+       kfd->sdma_fw_version = kfd->kfd2kgd->get_fw_version(kfd->kgd,
+                       KGD_ENGINE_SDMA1);
        kfd->shared_resources = *gpu_resources;
 
        kfd->vm_info.first_vmid_kfd = ffs(gpu_resources->compute_vmid_bitmap)-1;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index a07e57d1b400fbf2df0fe48ca491d163df8281ab..6f3a5bd489bd6f7c0a6407f7e362e2b188bc87d3 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -247,6 +247,10 @@ struct kfd_dev {
        /* Debug manager */
        struct kfd_dbgmgr           *dbgmgr;
 
+       /* Firmware versions */
+       uint16_t mec_fw_version;
+       uint16_t sdma_fw_version;
+
        /* Maximum process number mapped to HW scheduler */
        unsigned int max_proc_per_quantum;
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index fbba1fed447fe31c82c4f0215ac276ba7c1de9c4..54ff7fe03e78705638c880bcff4da15df7f949c1 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -482,11 +482,11 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr,
                                (unsigned long long int) 0);
 
                sysfs_show_32bit_prop(buffer, "fw_version",
-                       dev->gpu->kfd2kgd->get_fw_version(
-                                               dev->gpu->kgd,
-                                               KGD_ENGINE_MEC1));
+                               dev->gpu->mec_fw_version);
                sysfs_show_32bit_prop(buffer, "capability",
                                dev->node_props.capability);
+               sysfs_show_32bit_prop(buffer, "sdma_fw_version",
+                               dev->gpu->sdma_fw_version);
        }
 
        return sysfs_show_32bit_prop(buffer, "max_engine_clk_ccompute",