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

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

drivers/gpu/drm/amd/amdkfd/kfd_crat.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE