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

Keep the same use of CHIP_IDs for navi12 in kfd

Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
index 1ef3c32852d9410e6a4fe25fb7ee3aa0f9ff1bbd..0c327e0fc0f7d80d1543dd4e2b52995692734aeb 100644 (file)
--- 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 270389baa096805e50550606cfab244ca516c921..edfbae5c289d7ac7d6f6cf62bbc455413fb6f863 100644 (file)
--- 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 399a6121d513ccf2f8f297e2dde64dbdcc0066bc..54f0c5cc2f8506960f3cf473595fa2572f1b356b 100644 (file)
--- 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 481661499c9a96ff10c1e6e4ace47992593efc12..450c991c66aa20f33de88bc53c5fe16268c6ac6d 100644 (file)
--- 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 990ab545c0f54399fbe127ad2d095f0c79c607d9..11d2448913938ddc0f65e3ff56fa87d8f4e3d451 100644 (file)
--- 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 af62be070db1b17288f9126acd784956af7596a0..83ef4b3dd2fbb2ce1393c268c16c33388bc6136d 100644 (file)
--- 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 f2170f0e43347cb92687089fb6bed108bab03af1..453832e187d51df6f8aaeda8c0fc79c648ca4933 100644 (file)
--- 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) &