Skip to content

L
linux
Commit a0e7e140 authored by Amber Lin's avatar Amber Lin Committed by Alex Deucher
Browse files
Options

drm/amdkfd: Remove unused entries in table 

Remove unused entries in kfd_device_info table: num_xgmi_sdma_engines
and num_sdma_queues_per_engine. They are calculated in
kfd_get_num_sdma_engines and kfd_get_num_xgmi_sdma_engines instead.
Signed-off-by: default avatarAmber Lin <Amber.Lin@amd.com>
Reviewed-by: default avatarGraham Sider <Graham.Sider@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1f5fc7a5
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 60 deletions
drivers/gpu/drm/amd/amdkfd/kfd_device.c
View file @ a0e7e140
...@@ -68,8 +68,6 @@ static const struct kfd_device_info kaveri_device_info = { ...@@ -68,8 +68,6 @@ static const struct kfd_device_info kaveri_device_info = {
.supports_cwsr = false, .supports_cwsr = false,
.needs_iommu_device = true, .needs_iommu_device = true,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -87,8 +85,6 @@ static const struct kfd_device_info carrizo_device_info = { ...@@ -87,8 +85,6 @@ static const struct kfd_device_info carrizo_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = true, .needs_iommu_device = true,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -105,8 +101,6 @@ static const struct kfd_device_info raven_device_info = { ...@@ -105,8 +101,6 @@ static const struct kfd_device_info raven_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = true, .needs_iommu_device = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.num_sdma_engines = 1,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
#endif #endif
...@@ -126,8 +120,6 @@ static const struct kfd_device_info hawaii_device_info = { ...@@ -126,8 +120,6 @@ static const struct kfd_device_info hawaii_device_info = {
.supports_cwsr = false, .supports_cwsr = false,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
#endif #endif
...@@ -145,8 +137,6 @@ static const struct kfd_device_info tonga_device_info = { ...@@ -145,8 +137,6 @@ static const struct kfd_device_info tonga_device_info = {
.supports_cwsr = false, .supports_cwsr = false,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -163,8 +153,6 @@ static const struct kfd_device_info fiji_device_info = { ...@@ -163,8 +153,6 @@ static const struct kfd_device_info fiji_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -181,8 +169,6 @@ static const struct kfd_device_info fiji_vf_device_info = { ...@@ -181,8 +169,6 @@ static const struct kfd_device_info fiji_vf_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -200,8 +186,6 @@ static const struct kfd_device_info polaris10_device_info = { ...@@ -200,8 +186,6 @@ static const struct kfd_device_info polaris10_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -218,8 +202,6 @@ static const struct kfd_device_info polaris10_vf_device_info = { ...@@ -218,8 +202,6 @@ static const struct kfd_device_info polaris10_vf_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -236,8 +218,6 @@ static const struct kfd_device_info polaris11_device_info = { ...@@ -236,8 +218,6 @@ static const struct kfd_device_info polaris11_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -254,8 +234,6 @@ static const struct kfd_device_info polaris12_device_info = { ...@@ -254,8 +234,6 @@ static const struct kfd_device_info polaris12_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -272,8 +250,6 @@ static const struct kfd_device_info vegam_device_info = { ...@@ -272,8 +250,6 @@ static const struct kfd_device_info vegam_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -290,8 +266,6 @@ static const struct kfd_device_info vega10_device_info = { ...@@ -290,8 +266,6 @@ static const struct kfd_device_info vega10_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -308,8 +282,6 @@ static const struct kfd_device_info vega10_vf_device_info = { ...@@ -308,8 +282,6 @@ static const struct kfd_device_info vega10_vf_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -326,8 +298,6 @@ static const struct kfd_device_info vega12_device_info = { ...@@ -326,8 +298,6 @@ static const struct kfd_device_info vega12_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -344,8 +314,6 @@ static const struct kfd_device_info vega20_device_info = { ...@@ -344,8 +314,6 @@ static const struct kfd_device_info vega20_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -362,8 +330,6 @@ static const struct kfd_device_info arcturus_device_info = { ...@@ -362,8 +330,6 @@ static const struct kfd_device_info arcturus_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 6,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -380,8 +346,6 @@ static const struct kfd_device_info aldebaran_device_info = { ...@@ -380,8 +346,6 @@ static const struct kfd_device_info aldebaran_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 3,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -398,8 +362,6 @@ static const struct kfd_device_info renoir_device_info = { ...@@ -398,8 +362,6 @@ static const struct kfd_device_info renoir_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_iommu_device = false, .needs_iommu_device = false,
.needs_pci_atomics = false, .needs_pci_atomics = false,
.num_sdma_engines = 1,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -417,8 +379,6 @@ static const struct kfd_device_info navi10_device_info = { ...@@ -417,8 +379,6 @@ static const struct kfd_device_info navi10_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.no_atomic_fw_version = 145, .no_atomic_fw_version = 145,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -436,8 +396,6 @@ static const struct kfd_device_info navi12_device_info = { ...@@ -436,8 +396,6 @@ static const struct kfd_device_info navi12_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.no_atomic_fw_version = 145, .no_atomic_fw_version = 145,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -455,8 +413,6 @@ static const struct kfd_device_info navi14_device_info = { ...@@ -455,8 +413,6 @@ static const struct kfd_device_info navi14_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.no_atomic_fw_version = 145, .no_atomic_fw_version = 145,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -474,8 +430,6 @@ static const struct kfd_device_info sienna_cichlid_device_info = { ...@@ -474,8 +430,6 @@ static const struct kfd_device_info sienna_cichlid_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.no_atomic_fw_version = 92, .no_atomic_fw_version = 92,
.num_sdma_engines = 4,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -493,8 +447,6 @@ static const struct kfd_device_info navy_flounder_device_info = { ...@@ -493,8 +447,6 @@ static const struct kfd_device_info navy_flounder_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.no_atomic_fw_version = 92, .no_atomic_fw_version = 92,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -512,8 +464,6 @@ static const struct kfd_device_info vangogh_device_info = { ...@@ -512,8 +464,6 @@ static const struct kfd_device_info vangogh_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.no_atomic_fw_version = 92, .no_atomic_fw_version = 92,
.num_sdma_engines = 1,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -531,8 +481,6 @@ static const struct kfd_device_info dimgrey_cavefish_device_info = { ...@@ -531,8 +481,6 @@ static const struct kfd_device_info dimgrey_cavefish_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.no_atomic_fw_version = 92, .no_atomic_fw_version = 92,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -550,8 +498,6 @@ static const struct kfd_device_info beige_goby_device_info = { ...@@ -550,8 +498,6 @@ static const struct kfd_device_info beige_goby_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.no_atomic_fw_version = 92, .no_atomic_fw_version = 92,
.num_sdma_engines = 1,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
...@@ -569,8 +515,6 @@ static const struct kfd_device_info yellow_carp_device_info = { ...@@ -569,8 +515,6 @@ static const struct kfd_device_info yellow_carp_device_info = {
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.no_atomic_fw_version = 92, .no_atomic_fw_version = 92,
.num_sdma_engines = 1,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 2, .num_sdma_queues_per_engine = 2,
}; };
...@@ -587,8 +531,6 @@ static const struct kfd_device_info cyan_skillfish_device_info = { ...@@ -587,8 +531,6 @@ static const struct kfd_device_info cyan_skillfish_device_info = {
.needs_iommu_device = false, .needs_iommu_device = false,
.supports_cwsr = true, .supports_cwsr = true,
.needs_pci_atomics = true, .needs_pci_atomics = true,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
......
drivers/gpu/drm/amd/amdkfd/kfd_priv.h
View file @ a0e7e140
...@@ -208,8 +208,6 @@ struct kfd_device_info { ...@@ -208,8 +208,6 @@ struct kfd_device_info {
bool needs_iommu_device; bool needs_iommu_device;
bool needs_pci_atomics; bool needs_pci_atomics;
uint32_t no_atomic_fw_version; uint32_t no_atomic_fw_version;
unsigned int num_sdma_engines;
unsigned int num_xgmi_sdma_engines;
unsigned int num_sdma_queues_per_engine; unsigned int num_sdma_queues_per_engine;
}; };
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7