diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3967-drm-amdkfd-use-navi12-specific-family-id-for-navi12-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3967-drm-amdkfd-use-navi12-specific-family-id-for-navi12-.patch | 109 |
1 files changed, 109 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3967-drm-amdkfd-use-navi12-specific-family-id-for-navi12-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3967-drm-amdkfd-use-navi12-specific-family-id-for-navi12-.patch new file mode 100644 index 00000000..8b885ea3 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3967-drm-amdkfd-use-navi12-specific-family-id-for-navi12-.patch @@ -0,0 +1,109 @@ +From 4555bf4a65ef3b32ef35e36524f3e7d7564e5f19 Mon Sep 17 00:00:00 2001 +From: shaoyunl <shaoyun.liu@amd.com> +Date: Wed, 25 Sep 2019 17:07:38 -0400 +Subject: [PATCH 3967/4256] drm/amdkfd: use navi12 specific family id for + navi12 code path + +Keep the same use of CHIP_IDs for navi12 in kfd + +Change-Id: I5e52bbc058be51e79553147732a571a604537b7c +Signed-off-by: shaoyunl <shaoyun.liu@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- + 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_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + 7 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +index d9e075d66065..7655c6a2b184 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +@@ -676,6 +676,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, + num_of_cache_types = ARRAY_SIZE(renoir_cache_info); + break; + case CHIP_NAVI10: ++ case CHIP_NAVI12: + case CHIP_NAVI14: + pcache_info = navi10_cache_info; + num_of_cache_types = ARRAY_SIZE(navi10_cache_info); +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +index 43c4456b8620..d7e687062dd7 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +@@ -388,7 +388,7 @@ static const struct kfd_device_info navi10_device_info = { + }; + + static const struct kfd_device_info navi12_device_info = { +- .asic_family = CHIP_NAVI10, ++ .asic_family = CHIP_NAVI12, + .asic_name = "navi12", + .max_pasid_bits = 16, + .max_no_of_hqd = 24, +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 3aec5046d26d..02d2118fa9ba 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +@@ -1946,6 +1946,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_NAVI12: + case CHIP_NAVI14: + device_queue_manager_init_v10_navi10(&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 ae950633228c..bb77b8890e77 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +@@ -413,6 +413,7 @@ int kfd_init_apertures(struct kfd_process *process) + case CHIP_RENOIR: + case CHIP_ARCTURUS: + case CHIP_NAVI10: ++ case CHIP_NAVI12: + case CHIP_NAVI14: + 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 ac031dc09d66..5e2d75ca2b62 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +@@ -370,6 +370,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_NAVI12: + case CHIP_NAVI14: + kernel_queue_init_v10(&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 43e8e0258188..13bd55a92fd6 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c +@@ -246,6 +246,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_NAVI12: + case CHIP_NAVI14: + pm->pmf = &kfd_v10_pm_funcs; + break; +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +index ea6dc5d73c8c..49a1728dadf2 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +@@ -1396,6 +1396,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) + case CHIP_RENOIR: + case CHIP_ARCTURUS: + case CHIP_NAVI10: ++ case CHIP_NAVI12: + case CHIP_NAVI14: + dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 << + HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) & +-- +2.17.1 + |