drm/amdkfd: Support Navi14 in KFD
Subsystems (3)
PATCH 1/1 drm/amdkfd: Support Navi14 in KFD
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +++++++++++++++++++ .../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, 25 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -0
@@ -671,6 +671,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, num_of_cache_types =ARRAY_SIZE (raven_cache_info);break ;case CHIP_NAVI10 : +case CHIP_NAVI14 : pcache_info = navi10_cache_info; num_of_cache_types =ARRAY_SIZE (navi10_cache_info);break ;
drivers/gpu/drm/amd/amdkfd/kfd_device.c +19 -0
@@ -369,6 +369,24 @@ static const struct kfd_device_info navi10_device_info = { .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. */ static const struct kfd_device_info *kfd_supported_devices[][2 ] = { #ifdef KFD_SUPPORT_IOMMU_V2
@@ -388,6 +406,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { [CHIP_VEGA20] = {&vega20_device_info, NULL}, [CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info}, [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,
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -0
@@ -1908,6 +1908,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)device_queue_manager_init_v9 (&dqm->asic_ops);break ;case CHIP_NAVI10 : +case CHIP_NAVI14 :device_queue_manager_init_v10_navi10 (&dqm->asic_ops);break ;default :
drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +1 -0
@@ -412,6 +412,7 @@ int kfd_init_apertures(struct kfd_process *process)case CHIP_RAVEN :case CHIP_ARCTURUS :case CHIP_NAVI10 : +case CHIP_NAVI14 :kfd_init_apertures_v9 (pdd, id);break ;default :
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +1 -0
@@ -368,6 +368,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,kernel_queue_init_v9 (&kq->ops_asic_specific);break ;case CHIP_NAVI10 : +case CHIP_NAVI14 :kernel_queue_init_v10 (&kq->ops_asic_specific);break ;default :
drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +1 -0
@@ -243,6 +243,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm) pm->pmf = &kfd_v9_pm_funcs;break ;case CHIP_NAVI10 : +case CHIP_NAVI14 : pm->pmf = &kfd_v10_pm_funcs;break ;default :
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1 -0
@@ -1395,6 +1395,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)case CHIP_RAVEN :case CHIP_ARCTURUS :case CHIP_NAVI10 : +case CHIP_NAVI14 : dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT ) &HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK );
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Kuehling, Felix
Reviewed-by Felix KuehlingQuoted 2 lines · Yong
Change-Id Ie2c6226022ff4d389eaa05b1c84afa7ae4cea0aaSigned-off-by Yong Zhao <[email protected]>
Please add a change description. With that fixed, this patch is
Quoted 112 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +++++++++++++++++++ .../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, 25 insertions(+)drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1
-0@@ -671,6 +671,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, num_of_cache_types =ARRAY_SIZE (raven_cache_info);break ;case CHIP_NAVI10 : +case CHIP_NAVI14 : pcache_info = navi10_cache_info; num_of_cache_types =ARRAY_SIZE (navi10_cache_info);break ;drivers/gpu/drm/amd/amdkfd/kfd_device.c +19
-0@@ -369,6 +369,24 @@ static const struct kfd_device_info navi10_device_info = { .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. */ static const struct kfd_device_info *kfd_supported_devices[][2 ] = { #ifdef KFD_SUPPORT_IOMMU_V2@@ -388,6 +406,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { [CHIP_VEGA20] = {&vega20_device_info, NULL}, [CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info}, [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,drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1
-0@@ -1908,6 +1908,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)device_queue_manager_init_v9 (&dqm->asic_ops);break ;case CHIP_NAVI10 : +case CHIP_NAVI14 :device_queue_manager_init_v10_navi10 (&dqm->asic_ops);break ;default :drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +1
-0@@ -412,6 +412,7 @@ int kfd_init_apertures(struct kfd_process *process)case CHIP_RAVEN :case CHIP_ARCTURUS :case CHIP_NAVI10 : +case CHIP_NAVI14 :kfd_init_apertures_v9 (pdd, id);break ;default :drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +1
-0@@ -368,6 +368,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,kernel_queue_init_v9 (&kq->ops_asic_specific);break ;case CHIP_NAVI10 : +case CHIP_NAVI14 :kernel_queue_init_v10 (&kq->ops_asic_specific);break ;default :drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +1
-0@@ -243,6 +243,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm) pm->pmf = &kfd_v9_pm_funcs;break ;case CHIP_NAVI10 : +case CHIP_NAVI14 : pm->pmf = &kfd_v10_pm_funcs;break ;default :drivers/gpu/drm/amd/amdkfd/kfd_topology.c +0
-0
drivers/gpu/drm/amd/amdkfd/kfd_topology.c int kfd_topology_add_device(struct kfd_dev *gpu) · line 1401
Quoted 7 lines
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1
-0@@ -1395,6 +1395,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)case CHIP_RAVEN :case CHIP_ARCTURUS :case CHIP_NAVI10 : +case CHIP_NAVI14 : dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT ) &HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK );
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): d0577827-e7d2-26c4-a610-917c895d2b2d-5C7GfCeVMHo@public.gmane.org
Fixed and pushed. Thanks.
Regards,
Yong
Quoted 119 lines · Felix
Quoted 2 lines · Yong
Change-Id Ie2c6226022ff4d389eaa05b1c84afa7ae4cea0aaSigned-off-by Yong Zhao <[email protected]>Please add a change description. With that fixed, this patch is
Reviewed-by Felix Kuehling <[email protected]>Quoted 111 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +++++++++++++++++++ .../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, 25 insertions(+)drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1
-0@@ -671,6 +671,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, num_of_cache_types =ARRAY_SIZE (raven_cache_info);break ;case CHIP_NAVI10 : +case CHIP_NAVI14 : pcache_info = navi10_cache_info; num_of_cache_types =ARRAY_SIZE (navi10_cache_info);break ;drivers/gpu/drm/amd/amdkfd/kfd_device.c +19
-0@@ -369,6 +369,24 @@ static const struct kfd_device_info navi10_device_info = { .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. */ static const struct kfd_device_info *kfd_supported_devices[][2 ] = { #ifdef KFD_SUPPORT_IOMMU_V2@@ -388,6 +406,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { [CHIP_VEGA20] = {&vega20_device_info, NULL}, [CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info}, [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,drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1
-0@@ -1908,6 +1908,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)device_queue_manager_init_v9 (&dqm->asic_ops);break ;case CHIP_NAVI10 : +case CHIP_NAVI14 :device_queue_manager_init_v10_navi10 (&dqm->asic_ops);break ;default :drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +1
-0@@ -412,6 +412,7 @@ int kfd_init_apertures(struct kfd_process *process)case CHIP_RAVEN :case CHIP_ARCTURUS :case CHIP_NAVI10 : +case CHIP_NAVI14 :kfd_init_apertures_v9 (pdd, id);break ;default :drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +1
-0@@ -368,6 +368,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,kernel_queue_init_v9 (&kq->ops_asic_specific);break ;case CHIP_NAVI10 : +case CHIP_NAVI14 :kernel_queue_init_v10 (&kq->ops_asic_specific);break ;default :drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +1
-0@@ -243,6 +243,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm) pm->pmf = &kfd_v9_pm_funcs;break ;case CHIP_NAVI10 : +case CHIP_NAVI14 : pm->pmf = &kfd_v10_pm_funcs;break ;default :drivers/gpu/drm/amd/amdkfd/kfd_topology.c +0
-0
Quoted 8 lines
drivers/gpu/drm/amd/amdkfd/kfd_topology.c int kfd_topology_add_device(struct kfd_dev *gpu) · line 1401
Quoted 8 lines
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1
-0@@ -1395,6 +1395,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)case CHIP_RAVEN :case CHIP_ARCTURUS :case CHIP_NAVI10 : +case CHIP_NAVI14 : dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT ) &HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK );
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx