Commit 3a2f0c81 authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher
Browse files

drm/amdkfd: Support Sienna_Cichlid KFD v4 



v4: drop get_tile_config, comment out other callbacks

Signed-off-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 81d9bfb8

drivers/gpu/drm/amd/amdgpu/Makefile

+7 −6
Original line number Diff line number Diff line
@@ -181,7 +181,8 @@ amdgpu-y += \ 
	amdgpu_amdkfd_gfx_v8.o \

	amdgpu_amdkfd_gfx_v9.o \

	amdgpu_amdkfd_arcturus.o \

	 amdgpu_amdkfd_gfx_v10.o

	amdgpu_amdkfd_gfx_v10.o \

	amdgpu_amdkfd_gfx_v10_3.o



ifneq ($(CONFIG_DRM_AMDGPU_CIK),)

amdgpu-y += amdgpu_amdkfd_gfx_v7.o

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c

0 → 100644
+834 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+1 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, 
	case CHIP_NAVI10:

	case CHIP_NAVI12:

	case CHIP_NAVI14:

	case CHIP_SIENNA_CICHLID:

		pcache_info = navi10_cache_info;

		num_of_cache_types = ARRAY_SIZE(navi10_cache_info);

		break;

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

+21 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ extern const struct kfd2kgd_calls gfx_v8_kfd2kgd; 
extern const struct kfd2kgd_calls gfx_v9_kfd2kgd;

extern const struct kfd2kgd_calls arcturus_kfd2kgd;

extern const struct kfd2kgd_calls gfx_v10_kfd2kgd;

extern const struct kfd2kgd_calls gfx_v10_3_kfd2kgd;



static const struct kfd2kgd_calls *kfd2kgd_funcs[] = {

#ifdef KFD_SUPPORT_IOMMU_V2
@@ -72,6 +73,7 @@ static const struct kfd2kgd_calls *kfd2kgd_funcs[] = { 
	[CHIP_NAVI10] = &gfx_v10_kfd2kgd,

	[CHIP_NAVI12] = &gfx_v10_kfd2kgd,

	[CHIP_NAVI14] = &gfx_v10_kfd2kgd,

	[CHIP_SIENNA_CICHLID] = &gfx_v10_3_kfd2kgd,

};



#ifdef KFD_SUPPORT_IOMMU_V2
@@ -458,6 +460,24 @@ static const struct kfd_device_info navi14_device_info = { 
	.num_sdma_queues_per_engine = 8,

};



static const struct kfd_device_info sienna_cichlid_device_info = {

	.asic_family = CHIP_SIENNA_CICHLID,

	.asic_name = "sienna_cichlid",

	.max_pasid_bits = 16,

	.max_no_of_hqd  = 24,

	.doorbell_size  = 8,

	.ih_ring_entry_size = 8 * sizeof(uint32_t),

	.event_interrupt_class = &event_interrupt_class_v9,

	.num_of_watch_points = 4,

	.mqd_size_aligned = MQD_SIZE_ALIGNED,

	.needs_iommu_device = false,

	.supports_cwsr = true,

	.needs_pci_atomics = false,

	.num_sdma_engines = 4,

	.num_xgmi_sdma_engines = 0,

	.num_sdma_queues_per_engine = 8,

};



/* For each entry, [0] is regular and [1] is virtualisation device. */

static const struct kfd_device_info *kfd_supported_devices[][2] = {

#ifdef KFD_SUPPORT_IOMMU_V2
@@ -480,6 +500,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { 
	[CHIP_NAVI10] = {&navi10_device_info, NULL},

	[CHIP_NAVI12] = {&navi12_device_info, &navi12_device_info},

	[CHIP_NAVI14] = {&navi14_device_info, NULL},

	[CHIP_SIENNA_CICHLID] = {&sienna_cichlid_device_info, NULL},

};



static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,

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

+1 −0
Original line number Diff line number Diff line
@@ -1943,6 +1943,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) 
	case CHIP_NAVI10:

	case CHIP_NAVI12:

	case CHIP_NAVI14:

	case CHIP_SIENNA_CICHLID:

		device_queue_manager_init_v10_navi10(&dqm->asic_ops);

		break;

	default: