[PATCH] drm/amdkfd: use navi12 specific family id for navi12 code path

[Liu, Shaoyun]

Ping.
________________________________
From: Liu, Shaoyun <Shaoyun.Liu at amd.com>
Sent: September 25, 2019 5:14:08 PM
To: amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
Cc: Liu, Shaoyun <Shaoyun.Liu at amd.com>
Subject: [PATCH] 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 at 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 1ef3c32..0c327e0 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 270389b..edfbae5c 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 399a612..54f0c5cc 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -1798,6 +1798,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 4816614..450c991 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
@@ -408,6 +408,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 990ab54..11d2448 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
@@ -335,6 +335,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 af62be0..83ef4b3 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
@@ -244,6 +244,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 f2170f0..453832e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1320,6 +1320,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.7.4

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20190926/66ed5ec7/attachment.html>