Commit 8099ae40 authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher

drm/amdkfd: Support Navi14 in KFD

Initial support of Navi14 in KFD. The device IDs will be added later.
Signed-off-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7cae7061
...@@ -671,6 +671,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, ...@@ -671,6 +671,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
num_of_cache_types = ARRAY_SIZE(raven_cache_info); num_of_cache_types = ARRAY_SIZE(raven_cache_info);
break; break;
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI14:
pcache_info = navi10_cache_info; pcache_info = navi10_cache_info;
num_of_cache_types = ARRAY_SIZE(navi10_cache_info); num_of_cache_types = ARRAY_SIZE(navi10_cache_info);
break; break;
......
...@@ -369,6 +369,24 @@ static const struct kfd_device_info navi10_device_info = { ...@@ -369,6 +369,24 @@ static const struct kfd_device_info navi10_device_info = {
.num_sdma_queues_per_engine = 8, .num_sdma_queues_per_engine = 8,
}; };
static const struct kfd_device_info navi14_device_info = {
.asic_family = CHIP_NAVI14,
.asic_name = "navi14",
.max_pasid_bits = 16,
.max_no_of_hqd = 24,
.doorbell_size = 8,
.ih_ring_entry_size = 8 * sizeof(uint32_t),
.event_interrupt_class = &event_interrupt_class_v9,
.num_of_watch_points = 4,
.mqd_size_aligned = MQD_SIZE_ALIGNED,
.needs_iommu_device = false,
.supports_cwsr = true,
.needs_pci_atomics = false,
.num_sdma_engines = 2,
.num_xgmi_sdma_engines = 0,
.num_sdma_queues_per_engine = 8,
};
/* For each entry, [0] is regular and [1] is virtualisation device. */ /* For each entry, [0] is regular and [1] is virtualisation device. */
static const struct kfd_device_info *kfd_supported_devices[][2] = { static const struct kfd_device_info *kfd_supported_devices[][2] = {
#ifdef KFD_SUPPORT_IOMMU_V2 #ifdef KFD_SUPPORT_IOMMU_V2
...@@ -388,6 +406,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { ...@@ -388,6 +406,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = {
[CHIP_VEGA20] = {&vega20_device_info, NULL}, [CHIP_VEGA20] = {&vega20_device_info, NULL},
[CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info}, [CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info},
[CHIP_NAVI10] = {&navi10_device_info, NULL}, [CHIP_NAVI10] = {&navi10_device_info, NULL},
[CHIP_NAVI14] = {&navi14_device_info, NULL},
}; };
static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size, static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
......
...@@ -1790,6 +1790,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) ...@@ -1790,6 +1790,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)
device_queue_manager_init_v9(&dqm->asic_ops); device_queue_manager_init_v9(&dqm->asic_ops);
break; break;
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI14:
device_queue_manager_init_v10_navi10(&dqm->asic_ops); device_queue_manager_init_v10_navi10(&dqm->asic_ops);
break; break;
default: default:
......
...@@ -407,6 +407,7 @@ int kfd_init_apertures(struct kfd_process *process) ...@@ -407,6 +407,7 @@ int kfd_init_apertures(struct kfd_process *process)
case CHIP_RAVEN: case CHIP_RAVEN:
case CHIP_ARCTURUS: case CHIP_ARCTURUS:
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI14:
kfd_init_apertures_v9(pdd, id); kfd_init_apertures_v9(pdd, id);
break; break;
default: default:
......
...@@ -334,6 +334,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, ...@@ -334,6 +334,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,
kernel_queue_init_v9(&kq->ops_asic_specific); kernel_queue_init_v9(&kq->ops_asic_specific);
break; break;
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI14:
kernel_queue_init_v10(&kq->ops_asic_specific); kernel_queue_init_v10(&kq->ops_asic_specific);
break; break;
default: default:
......
...@@ -243,6 +243,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm) ...@@ -243,6 +243,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm)
pm->pmf = &kfd_v9_pm_funcs; pm->pmf = &kfd_v9_pm_funcs;
break; break;
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI14:
pm->pmf = &kfd_v10_pm_funcs; pm->pmf = &kfd_v10_pm_funcs;
break; break;
default: default:
......
...@@ -1319,6 +1319,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) ...@@ -1319,6 +1319,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
case CHIP_RAVEN: case CHIP_RAVEN:
case CHIP_ARCTURUS: case CHIP_ARCTURUS:
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI14:
dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 << dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<
HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) & HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) &
HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK); HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK);
......
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