UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
shaoyunl 2019-09-25 17:07:38 -04:00 committed by Alex Deucher
parent 3f94281751
commit 0e94b5640b
7 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/amd/amdkfd/kfd_crat.c
View File

@ -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);

2
drivers/gpu/drm/amd/amdkfd/kfd_device.c
View File

@ -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,

1
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
View File

@ -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;

1
drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
View File

@ -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;

1
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
View File

@ -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;

1
drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
View File

@ -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;

1
drivers/gpu/drm/amd/amdkfd/kfd_topology.c
View File

@ -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) &