Skip to content

Commit de89b2e

Browse files
Chengming Guialexdeucher
authored andcommitted
drm/amdkfd: Support navy_flounder KFD
Add KFD support for Navy Flounder. Signed-off-by: Chengming Gui <[email protected]> Reviewed-by: Tao Zhou <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent f081e69 commit de89b2e

File tree

6 files changed

+24
-0
lines changed

6 files changed

+24
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
679679
case CHIP_NAVI12:
680680
case CHIP_NAVI14:
681681
case CHIP_SIENNA_CICHLID:
682+
case CHIP_NAVY_FLOUNDER:
682683
pcache_info = navi10_cache_info;
683684
num_of_cache_types = ARRAY_SIZE(navi10_cache_info);
684685
break;

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,24 @@ static const struct kfd_device_info sienna_cichlid_device_info = {
478478
.num_sdma_queues_per_engine = 8,
479479
};
480480

481+
static const struct kfd_device_info navy_flounder_device_info = {
482+
.asic_family = CHIP_NAVY_FLOUNDER,
483+
.asic_name = "navy_flounder",
484+
.max_pasid_bits = 16,
485+
.max_no_of_hqd = 24,
486+
.doorbell_size = 8,
487+
.ih_ring_entry_size = 8 * sizeof(uint32_t),
488+
.event_interrupt_class = &event_interrupt_class_v9,
489+
.num_of_watch_points = 4,
490+
.mqd_size_aligned = MQD_SIZE_ALIGNED,
491+
.needs_iommu_device = false,
492+
.supports_cwsr = true,
493+
.needs_pci_atomics = false,
494+
.num_sdma_engines = 2,
495+
.num_xgmi_sdma_engines = 0,
496+
.num_sdma_queues_per_engine = 8,
497+
};
498+
481499
/* For each entry, [0] is regular and [1] is virtualisation device. */
482500
static const struct kfd_device_info *kfd_supported_devices[][2] = {
483501
#ifdef KFD_SUPPORT_IOMMU_V2
@@ -501,6 +519,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = {
501519
[CHIP_NAVI12] = {&navi12_device_info, &navi12_device_info},
502520
[CHIP_NAVI14] = {&navi14_device_info, NULL},
503521
[CHIP_SIENNA_CICHLID] = {&sienna_cichlid_device_info, &sienna_cichlid_device_info},
522+
[CHIP_NAVY_FLOUNDER] = {&navy_flounder_device_info, &navy_flounder_device_info},
504523
};
505524

506525
static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1939,6 +1939,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)
19391939
case CHIP_NAVI12:
19401940
case CHIP_NAVI14:
19411941
case CHIP_SIENNA_CICHLID:
1942+
case CHIP_NAVY_FLOUNDER:
19421943
device_queue_manager_init_v10_navi10(&dqm->asic_ops);
19431944
break;
19441945
default:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ int kfd_init_apertures(struct kfd_process *process)
416416
case CHIP_NAVI12:
417417
case CHIP_NAVI14:
418418
case CHIP_SIENNA_CICHLID:
419+
case CHIP_NAVY_FLOUNDER:
419420
kfd_init_apertures_v9(pdd, id);
420421
break;
421422
default:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm)
246246
case CHIP_NAVI12:
247247
case CHIP_NAVI14:
248248
case CHIP_SIENNA_CICHLID:
249+
case CHIP_NAVY_FLOUNDER:
249250
pm->pmf = &kfd_v9_pm_funcs;
250251
break;
251252
default:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,6 +1374,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
13741374
case CHIP_NAVI12:
13751375
case CHIP_NAVI14:
13761376
case CHIP_SIENNA_CICHLID:
1377+
case CHIP_NAVY_FLOUNDER:
13771378
dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<
13781379
HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) &
13791380
HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK);

0 commit comments

Comments
 (0)