diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2760-drm-amdkfd-Add-VegaM-support.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2760-drm-amdkfd-Add-VegaM-support.patch | 143 |
1 files changed, 143 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2760-drm-amdkfd-Add-VegaM-support.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2760-drm-amdkfd-Add-VegaM-support.patch new file mode 100644 index 00000000..0607611e --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2760-drm-amdkfd-Add-VegaM-support.patch @@ -0,0 +1,143 @@ +From 4e1ca54c07079a60e259f2a56bb6b92e4400a33a Mon Sep 17 00:00:00 2001 +From: Kent Russell <kent.russell@amd.com> +Date: Thu, 21 Mar 2019 08:08:17 -0400 +Subject: [PATCH 2760/2940] drm/amdkfd: Add VegaM support + +Add the Polaris22/VegaM information to KFD + +Change-Id: Ice04107e75360a8976ca051d9d71f118d4262a68 +Signed-off-by: Kent Russell <kent.russell@amd.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 5 +++++ + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 20 +++++++++++++++++++ + .../drm/amd/amdkfd/kfd_device_queue_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 + + .../gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + 7 files changed, 30 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +index 57e32c69c805..f0d5be27af63 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +@@ -134,6 +134,7 @@ static struct kfd_gpu_cache_info carrizo_cache_info[] = { + #define polaris10_cache_info carrizo_cache_info + #define polaris11_cache_info carrizo_cache_info + #define polaris12_cache_info carrizo_cache_info ++#define vegam_cache_info carrizo_cache_info + /* TODO - check & update Vega10 cache details */ + #define vega10_cache_info carrizo_cache_info + #define raven_cache_info carrizo_cache_info +@@ -652,6 +653,10 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, + pcache_info = polaris12_cache_info; + num_of_cache_types = ARRAY_SIZE(polaris12_cache_info); + break; ++ case CHIP_VEGAM: ++ pcache_info = vegam_cache_info; ++ num_of_cache_types = ARRAY_SIZE(vegam_cache_info); ++ break; + case CHIP_VEGA10: + case CHIP_VEGA12: + case CHIP_VEGA20: +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +index 8c44419f677f..94804635016a 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +@@ -232,6 +232,23 @@ static const struct kfd_device_info polaris12_device_info = { + .num_sdma_queues_per_engine = 2, + }; + ++static const struct kfd_device_info vegam_device_info = { ++ .asic_family = CHIP_VEGAM, ++ .max_pasid_bits = 16, ++ .max_no_of_hqd = 24, ++ .doorbell_size = 4, ++ .ih_ring_entry_size = 4 * sizeof(uint32_t), ++ .event_interrupt_class = &event_interrupt_class_cik, ++ .num_of_watch_points = 4, ++ .mqd_size_aligned = MQD_SIZE_ALIGNED, ++ .supports_cwsr = true, ++ .needs_iommu_device = false, ++ .needs_pci_atomics = true, ++ .num_sdma_engines = 2, ++ .num_xgmi_sdma_engines = 0, ++ .num_sdma_queues_per_engine = 2, ++}; ++ + static const struct kfd_device_info vega10_device_info = { + .asic_family = CHIP_VEGA10, + .max_pasid_bits = 16, +@@ -386,6 +403,9 @@ static const struct kfd_deviceid supported_devices[] = { + { 0x6995, &polaris12_device_info }, /* Polaris12 */ + { 0x6997, &polaris12_device_info }, /* Polaris12 */ + { 0x699F, &polaris12_device_info }, /* Polaris12 */ ++ { 0x694C, &vegam_device_info }, /* VegaM */ ++ { 0x694E, &vegam_device_info }, /* VegaM */ ++ { 0x694F, &vegam_device_info }, /* VegaM */ + { 0x6860, &vega10_device_info }, /* Vega10 */ + { 0x6861, &vega10_device_info }, /* Vega10 */ + { 0x6862, &vega10_device_info }, /* Vega10 */ +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +index 4aa959bf81eb..5b0fbf7ba659 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +@@ -1815,6 +1815,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) + case CHIP_POLARIS10: + case CHIP_POLARIS11: + case CHIP_POLARIS12: ++ case CHIP_VEGAM: + device_queue_manager_init_vi_tonga(&dqm->asic_ops); + break; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +index 45bc891feb1d..4859eeb87d5c 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +@@ -403,6 +403,7 @@ int kfd_init_apertures(struct kfd_process *process) + case CHIP_POLARIS10: + case CHIP_POLARIS11: + case CHIP_POLARIS12: ++ case CHIP_VEGAM: + kfd_init_apertures_vi(pdd, id); + break; + case CHIP_VEGA10: +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +index 3c4aef0ed20d..ed03d622eb08 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +@@ -349,6 +349,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, + case CHIP_POLARIS10: + case CHIP_POLARIS11: + case CHIP_POLARIS12: ++ case CHIP_VEGAM: + kernel_queue_init_vi(&kq->ops_asic_specific); + break; + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +index 077c47fd4fee..808194663a7d 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +@@ -228,6 +228,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm) + case CHIP_POLARIS10: + case CHIP_POLARIS11: + case CHIP_POLARIS12: ++ case CHIP_VEGAM: + pm->pmf = &kfd_vi_pm_funcs; + break; + case CHIP_VEGA10: +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +index e78718a95b61..0d5419814e10 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +@@ -1379,6 +1379,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) + case CHIP_POLARIS10: + case CHIP_POLARIS11: + case CHIP_POLARIS12: ++ case CHIP_VEGAM: + pr_debug("Adding doorbell packet type capability\n"); + dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_1_0 << + HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) & +-- +2.17.1 + |