From 7ee4c95ef5ce0847f665691321fbbb6b76b42bdb Mon Sep 17 00:00:00 2001 From: Amber Lin Date: Mon, 25 Jul 2016 10:09:20 -0400 Subject: [PATCH 1483/4131] drm/amdkfd: Add Polaris10/11 support Add Polaris10 and Polaris11 devices to KFD support Change-Id: Ib18655fd7a893e9a004ce1d14656ac2cdd9d4afd Signed-off-by: Amber Lin --- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 10 +++++++ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 34 ++++++++++++++++++++-- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 ++ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 ++ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 ++ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 ++ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 9 ++++-- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 ++ 8 files changed, 57 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c index e4d7375..3681fcf 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c @@ -106,6 +106,8 @@ static struct kfd_gpu_cache_info carrizo_cache_info[] = { #define hawaii_cache_info kaveri_cache_info #define tonga_cache_info carrizo_cache_info #define fiji_cache_info carrizo_cache_info +#define polaris10_cache_info carrizo_cache_info +#define polaris11_cache_info carrizo_cache_info static void kfd_populated_cu_info_cpu(struct kfd_topology_device *dev, struct crat_subtype_computeunit *cu) @@ -577,6 +579,14 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, pcache_info = fiji_cache_info; num_of_cache_types = ARRAY_SIZE(fiji_cache_info); break; + case CHIP_POLARIS10: + pcache_info = polaris10_cache_info; + num_of_cache_types = ARRAY_SIZE(polaris10_cache_info); + break; + case CHIP_POLARIS11: + pcache_info = polaris11_cache_info; + num_of_cache_types = ARRAY_SIZE(polaris11_cache_info); + break; default: return -EINVAL; } diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index 6ac3ec6..61c22a6 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -89,8 +89,30 @@ static const struct kfd_device_info fiji_device_info = { .num_of_watch_points = 4, .mqd_size_aligned = MQD_SIZE_ALIGNED, .is_need_iommu_device = false -} -; +}; + +static const struct kfd_device_info polaris10_device_info = { + .asic_family = CHIP_POLARIS10, + .max_pasid_bits = 16, + .max_no_of_hqd = 24, + .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, + .is_need_iommu_device = false +}; + +static const struct kfd_device_info polaris11_device_info = { + .asic_family = CHIP_POLARIS11, + .max_pasid_bits = 16, + .max_no_of_hqd = 24, + .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, + .is_need_iommu_device = false +}; + struct kfd_deviceid { unsigned short did; const struct kfd_device_info *device_info; @@ -157,7 +179,13 @@ static const struct kfd_deviceid supported_devices[] = { { 0x692F, &tonga_device_info }, /* Tonga */ { 0x6938, &tonga_device_info }, /* Tonga */ { 0x6939, &tonga_device_info }, /* Tonga */ - { 0x7300, &fiji_device_info } /* Fiji */ + { 0x7300, &fiji_device_info }, /* Fiji */ + { 0x67C4, &polaris10_device_info }, /* Polaris10 */ + { 0x67C7, &polaris10_device_info }, /* Polaris10 */ + { 0x67DF, &polaris10_device_info }, /* Polaris10 */ + { 0x67E3, &polaris11_device_info }, /* Polaris11 */ + { 0x67EF, &polaris11_device_info }, /* Polaris11 */ + { 0x67FF, &polaris11_device_info } /* Polaris11 */ }; 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 5f1fbbe..53fef02 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -1549,6 +1549,8 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) case CHIP_TONGA: case CHIP_FIJI: + case CHIP_POLARIS10: + case CHIP_POLARIS11: device_queue_manager_init_vi_tonga(&dqm->asic_ops); break; } diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c index 90a26fa..9eaa040 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c @@ -307,6 +307,8 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, case CHIP_CARRIZO: case CHIP_TONGA: case CHIP_FIJI: + case CHIP_POLARIS10: + case CHIP_POLARIS11: kernel_queue_init_vi(&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 3281eb1..99c2535 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c @@ -35,6 +35,8 @@ struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type, return mqd_manager_init_vi(type, dev); case CHIP_TONGA: case CHIP_FIJI: + case CHIP_POLARIS10: + case CHIP_POLARIS11: return mqd_manager_init_vi_tonga(type, dev); } diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c index 50d015f..f6a5171 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c @@ -622,6 +622,8 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm, case CHIP_CARRIZO: case CHIP_TONGA: case CHIP_FIJI: + case CHIP_POLARIS10: + case CHIP_POLARIS11: if (fw_ver >= KFD_SCRATCH_CZ_FW_VER) { pm->pmf->map_process = pm_create_map_process_scratch; pm->pmf->get_map_process_packet_size = diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h index 386ba6d..f0459c7 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -163,11 +163,14 @@ enum asic_family_type { CHIP_HAWAII, CHIP_CARRIZO, CHIP_TONGA, - CHIP_FIJI + CHIP_FIJI, + CHIP_POLARIS10, + CHIP_POLARIS11 }; -#define KFD_IS_VI(chip) ((chip) >= CHIP_CARRIZO && (chip) <= CHIP_FIJI) -#define KFD_IS_DGPU(chip) (((chip) >= CHIP_TONGA && (chip) <= CHIP_FIJI) || \ +#define KFD_IS_VI(chip) ((chip) >= CHIP_CARRIZO && (chip) <= CHIP_POLARIS11) +#define KFD_IS_DGPU(chip) (((chip) >= CHIP_TONGA && \ + (chip) <= CHIP_POLARIS11) || \ (chip) == CHIP_HAWAII) struct kfd_event_interrupt_class { diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index 24b1c2f..c60c5a4 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -1114,6 +1114,8 @@ int kfd_topology_add_device(struct kfd_dev *gpu) break; case CHIP_CARRIZO: case CHIP_FIJI: + case CHIP_POLARIS10: + case CHIP_POLARIS11: pr_debug("amdkfd: adding doorbell packet type capability\n"); dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_1_0 << HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) & -- 2.7.4