diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2699-drm-amdkfd-Vega20-bring-up-on-amdkfd-side.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2699-drm-amdkfd-Vega20-bring-up-on-amdkfd-side.patch | 150 |
1 files changed, 150 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2699-drm-amdkfd-Vega20-bring-up-on-amdkfd-side.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2699-drm-amdkfd-Vega20-bring-up-on-amdkfd-side.patch new file mode 100644 index 00000000..8ebe132f --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2699-drm-amdkfd-Vega20-bring-up-on-amdkfd-side.patch @@ -0,0 +1,150 @@ +From 343033b6ba6e3cce04b7a70cb96ce507eab3e766 Mon Sep 17 00:00:00 2001 +From: Shaoyun Liu <Shaoyun.Liu@amd.com> +Date: Tue, 31 Oct 2017 13:32:53 -0400 +Subject: [PATCH 2699/2940] drm/amdkfd: Vega20 bring up on amdkfd side + +Add Vega20 device IDs, device info and enable it in KFD. + +Signed-off-by: Shaoyun Liu <Shaoyun.Liu@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 22 +++++++++++++++++++ + .../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 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 1 + + .../gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + 8 files changed, 29 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +index d4560f1869bd..56412b0e7e1c 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +@@ -647,6 +647,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, + num_of_cache_types = ARRAY_SIZE(polaris11_cache_info); + break; + case CHIP_VEGA10: ++ case CHIP_VEGA20: + pcache_info = vega10_cache_info; + num_of_cache_types = ARRAY_SIZE(vega10_cache_info); + break; +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +index 56f2bd0a0238..cb96bdfc8f3e 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +@@ -236,6 +236,22 @@ static const struct kfd_device_info vega10_vf_device_info = { + .num_sdma_queues_per_engine = 2, + }; + ++static const struct kfd_device_info vega20_device_info = { ++ .asic_family = CHIP_VEGA20, ++ .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, ++ .supports_cwsr = true, ++ .needs_iommu_device = false, ++ .needs_pci_atomics = true, ++ .num_sdma_engines = 2, ++ .num_sdma_queues_per_engine = 8, ++}; ++ + struct kfd_deviceid { + unsigned short did; + const struct kfd_device_info *device_info; +@@ -323,6 +339,12 @@ static const struct kfd_deviceid supported_devices[] = { + { 0x6868, &vega10_device_info }, /* Vega10 */ + { 0x686C, &vega10_vf_device_info }, /* Vega10 vf*/ + { 0x687F, &vega10_device_info }, /* Vega10 */ ++ { 0x66a0, &vega20_device_info }, /* Vega20 */ ++ { 0x66a1, &vega20_device_info }, /* Vega20 */ ++ { 0x66a2, &vega20_device_info }, /* Vega20 */ ++ { 0x66a3, &vega20_device_info }, /* Vega20 */ ++ { 0x66a7, &vega20_device_info }, /* Vega20 */ ++ { 0x66af, &vega20_device_info } /* Vega20 */ + }; + + static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size, +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 d77b660d6a95..3bc0651d3bcc 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +@@ -1754,6 +1754,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) + break; + + case CHIP_VEGA10: ++ case CHIP_VEGA20: + case CHIP_RAVEN: + device_queue_manager_init_v9(&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 97d5423c5673..3d66cec414af 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +@@ -400,6 +400,7 @@ int kfd_init_apertures(struct kfd_process *process) + kfd_init_apertures_vi(pdd, id); + break; + case CHIP_VEGA10: ++ case CHIP_VEGA20: + case CHIP_RAVEN: + kfd_init_apertures_v9(pdd, id); + break; +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +index 9f84b4d9fb88..6c31f7370193 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +@@ -322,6 +322,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, + break; + + case CHIP_VEGA10: ++ case CHIP_VEGA20: + case CHIP_RAVEN: + kernel_queue_init_v9(&kq->ops_asic_specific); + break; +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +index 3bc25ab84f34..e33019a7a883 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +@@ -39,6 +39,7 @@ struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type, + case CHIP_POLARIS11: + return mqd_manager_init_vi_tonga(type, dev); + case CHIP_VEGA10: ++ case CHIP_VEGA20: + case CHIP_RAVEN: + return mqd_manager_init_v9(type, dev); + default: +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +index 1092631765cb..c6080ed3b6a7 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +@@ -229,6 +229,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm) + pm->pmf = &kfd_vi_pm_funcs; + break; + case CHIP_VEGA10: ++ case CHIP_VEGA20: + case CHIP_RAVEN: + pm->pmf = &kfd_v9_pm_funcs; + break; +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +index 54ff7fe03e78..e3843c5929ed 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +@@ -1278,6 +1278,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) + HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK); + break; + case CHIP_VEGA10: ++ case CHIP_VEGA20: + case CHIP_RAVEN: + dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 << + HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) & +-- +2.17.1 + |