Commit 5ade6c9c authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher

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: default avatarPhilip Yang <Philip.Yang@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 13cd51a8
...@@ -405,6 +405,10 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, ...@@ -405,6 +405,10 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
{ {
unsigned int size; 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->shared_resources = *gpu_resources;
kfd->vm_info.first_vmid_kfd = ffs(gpu_resources->compute_vmid_bitmap)-1; kfd->vm_info.first_vmid_kfd = ffs(gpu_resources->compute_vmid_bitmap)-1;
......
...@@ -247,6 +247,10 @@ struct kfd_dev { ...@@ -247,6 +247,10 @@ struct kfd_dev {
/* Debug manager */ /* Debug manager */
struct kfd_dbgmgr *dbgmgr; struct kfd_dbgmgr *dbgmgr;
/* Firmware versions */
uint16_t mec_fw_version;
uint16_t sdma_fw_version;
/* Maximum process number mapped to HW scheduler */ /* Maximum process number mapped to HW scheduler */
unsigned int max_proc_per_quantum; unsigned int max_proc_per_quantum;
......
...@@ -482,11 +482,11 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, ...@@ -482,11 +482,11 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr,
(unsigned long long int) 0); (unsigned long long int) 0);
sysfs_show_32bit_prop(buffer, "fw_version", sysfs_show_32bit_prop(buffer, "fw_version",
dev->gpu->kfd2kgd->get_fw_version( dev->gpu->mec_fw_version);
dev->gpu->kgd,
KGD_ENGINE_MEC1));
sysfs_show_32bit_prop(buffer, "capability", sysfs_show_32bit_prop(buffer, "capability",
dev->node_props.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", return sysfs_show_32bit_prop(buffer, "max_engine_clk_ccompute",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment