diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1315-drm-amdkfd-Prepare-Raven-for-KFD-enablement-at-amdkf.patch')
-rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1315-drm-amdkfd-Prepare-Raven-for-KFD-enablement-at-amdkf.patch | 154 |
1 files changed, 0 insertions, 154 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1315-drm-amdkfd-Prepare-Raven-for-KFD-enablement-at-amdkf.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1315-drm-amdkfd-Prepare-Raven-for-KFD-enablement-at-amdkf.patch deleted file mode 100644 index 443435df..00000000 --- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1315-drm-amdkfd-Prepare-Raven-for-KFD-enablement-at-amdkf.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 60c04fc7415ba05f5b74a404a2b75a42c4b1b62a Mon Sep 17 00:00:00 2001 -From: Yong Zhao <Yong.Zhao@amd.com> -Date: Tue, 25 Jul 2017 12:30:39 -0400 -Subject: [PATCH 1315/4131] drm/amdkfd: Prepare Raven for KFD enablement at - amdkfd side - -Change-Id: I86028f3da8549325a4946d5099e1d45359685bb3 -Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> ---- - drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 5 +++++ - drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 ++++++++++++++++++- - drivers/gpu/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 + - drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + - drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + - 8 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c -index f0ff2e0..d44fd2c 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c -@@ -116,6 +116,7 @@ static struct kfd_gpu_cache_info carrizo_cache_info[] = { - #define polaris11_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 - - static void kfd_populated_cu_info_cpu(struct kfd_topology_device *dev, - struct crat_subtype_computeunit *cu) -@@ -601,6 +602,10 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, - pcache_info = vega10_cache_info; - num_of_cache_types = ARRAY_SIZE(vega10_cache_info); - break; -+ case CHIP_RAVEN: -+ pcache_info = raven_cache_info; -+ num_of_cache_types = ARRAY_SIZE(raven_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 4ae0edb..d28a8ee 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c -@@ -211,6 +211,20 @@ static const struct kfd_device_info vega10_vf_device_info = { - }; - - -+static const struct kfd_device_info raven_device_info = { -+ .asic_family = CHIP_RAVEN, -+ .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, -+ .is_need_iommu_device = true, -+ .supports_cwsr = true, -+ .needs_pci_atomics = true, -+}; -+ - struct kfd_deviceid { - unsigned short did; - const struct kfd_device_info *device_info; -@@ -312,7 +326,10 @@ static const struct kfd_deviceid supported_devices[] = { - { 0x6867, &vega10_device_info }, /* Vega10 */ - { 0x6868, &vega10_device_info }, /* Vega10 */ - { 0x686C, &vega10_vf_device_info }, /* Vega10 vf*/ -- { 0x687F, &vega10_device_info } /* Vega10 */ -+ { 0x687F, &vega10_device_info }, /* Vega10 */ -+#if defined(CONFIG_AMD_IOMMU_V2_MODULE) || defined(CONFIG_AMD_IOMMU_V2) -+ { 0x15DD, &raven_device_info } /* Raven */ -+#endif - }; - - 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 7b17979..bfc87c0 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c -@@ -1629,6 +1629,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) - break; - - case CHIP_VEGA10: -+ case CHIP_RAVEN: - device_queue_manager_init_v9_vega10(&dqm->asic_ops); - break; - default: -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c -index 2e172f6..fcab9c6 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c -@@ -392,6 +392,7 @@ int kfd_init_apertures(struct kfd_process *process) - kfd_init_apertures_vi(pdd, id); - break; - case CHIP_VEGA10: -+ case CHIP_RAVEN: - kfd_init_apertures_v9(pdd, id); - break; - default: -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c -index 6d70d28..b303e57 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c -@@ -345,6 +345,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, - break; - - case CHIP_VEGA10: -+ case CHIP_RAVEN: - kernel_queue_init_v9(&kq->ops_asic_specific); - break; - default: -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c -index 3589c0b..9eb2d54 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c -@@ -81,6 +81,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_RAVEN: - return mqd_manager_init_v9(type, dev); - default: - BUG(); -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c -index 701e8e1..bd419d6 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c -@@ -239,6 +239,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm, - kfd_pm_func_init_vi(pm, fw_ver); - break; - case CHIP_VEGA10: -+ case CHIP_RAVEN: - kfd_pm_func_init_v9(pm, fw_ver); - break; - default: -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c -index cf9bd01..402c2bc 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c -@@ -1362,6 +1362,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) - HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK); - break; - case CHIP_VEGA10: -+ case CHIP_RAVEN: - dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 << - HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) & - HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK); --- -2.7.4 - |