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

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

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+4 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdkfd/kfd_topology.c

+3 −3
Original line number Diff line number Diff line
@@ -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",

CRA Git | Maintained and supported by SUSTech CRA and CCSE