Commit 0e94b564 authored by shaoyunl's avatar shaoyunl Committed by Alex Deucher

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: default avatarshaoyunl <shaoyun.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3f942817
...@@ -676,6 +676,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, ...@@ -676,6 +676,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
num_of_cache_types = ARRAY_SIZE(renoir_cache_info); num_of_cache_types = ARRAY_SIZE(renoir_cache_info);
break; break;
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI12:
case CHIP_NAVI14: case CHIP_NAVI14:
pcache_info = navi10_cache_info; pcache_info = navi10_cache_info;
num_of_cache_types = ARRAY_SIZE(navi10_cache_info); num_of_cache_types = ARRAY_SIZE(navi10_cache_info);
......
...@@ -388,7 +388,7 @@ static const struct kfd_device_info navi10_device_info = { ...@@ -388,7 +388,7 @@ static const struct kfd_device_info navi10_device_info = {
}; };
static const struct kfd_device_info navi12_device_info = { static const struct kfd_device_info navi12_device_info = {
.asic_family = CHIP_NAVI10, .asic_family = CHIP_NAVI12,
.asic_name = "navi12", .asic_name = "navi12",
.max_pasid_bits = 16, .max_pasid_bits = 16,
.max_no_of_hqd = 24, .max_no_of_hqd = 24,
......
...@@ -1798,6 +1798,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) ...@@ -1798,6 +1798,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)
device_queue_manager_init_v9(&dqm->asic_ops); device_queue_manager_init_v9(&dqm->asic_ops);
break; break;
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI12:
case CHIP_NAVI14: case CHIP_NAVI14:
device_queue_manager_init_v10_navi10(&dqm->asic_ops); device_queue_manager_init_v10_navi10(&dqm->asic_ops);
break; break;
......
...@@ -408,6 +408,7 @@ int kfd_init_apertures(struct kfd_process *process) ...@@ -408,6 +408,7 @@ int kfd_init_apertures(struct kfd_process *process)
case CHIP_RENOIR: case CHIP_RENOIR:
case CHIP_ARCTURUS: case CHIP_ARCTURUS:
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI12:
case CHIP_NAVI14: case CHIP_NAVI14:
kfd_init_apertures_v9(pdd, id); kfd_init_apertures_v9(pdd, id);
break; break;
......
...@@ -335,6 +335,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, ...@@ -335,6 +335,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,
kernel_queue_init_v9(&kq->ops_asic_specific); kernel_queue_init_v9(&kq->ops_asic_specific);
break; break;
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI12:
case CHIP_NAVI14: case CHIP_NAVI14:
kernel_queue_init_v10(&kq->ops_asic_specific); kernel_queue_init_v10(&kq->ops_asic_specific);
break; break;
......
...@@ -244,6 +244,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm) ...@@ -244,6 +244,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm)
pm->pmf = &kfd_v9_pm_funcs; pm->pmf = &kfd_v9_pm_funcs;
break; break;
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI12:
case CHIP_NAVI14: case CHIP_NAVI14:
pm->pmf = &kfd_v10_pm_funcs; pm->pmf = &kfd_v10_pm_funcs;
break; break;
......
...@@ -1320,6 +1320,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) ...@@ -1320,6 +1320,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
case CHIP_RENOIR: case CHIP_RENOIR:
case CHIP_ARCTURUS: case CHIP_ARCTURUS:
case CHIP_NAVI10: case CHIP_NAVI10:
case CHIP_NAVI12:
case CHIP_NAVI14: case CHIP_NAVI14:
dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 << dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<
HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) & HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) &
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment