Commit ed81cd6e authored by Kent Russell's avatar Kent Russell Committed by Alex Deucher
Browse files

drm/amdkfd: Add VegaM support 



Add the VegaM information to KFD

Signed-off-by: default avatarKent Russell <kent.russell@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 32cce8bc

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

+5 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static struct kfd_gpu_cache_info carrizo_cache_info[] = { 
#define polaris10_cache_info carrizo_cache_info

#define polaris11_cache_info carrizo_cache_info

#define polaris12_cache_info carrizo_cache_info

#define vegam_cache_info carrizo_cache_info

/* TODO - check & update Vega10 cache details */

#define vega10_cache_info carrizo_cache_info

#define raven_cache_info carrizo_cache_info
@@ -652,6 +653,10 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, 
		pcache_info = polaris12_cache_info;

		num_of_cache_types = ARRAY_SIZE(polaris12_cache_info);

		break;

	case CHIP_VEGAM:

		pcache_info = vegam_cache_info;

		num_of_cache_types = ARRAY_SIZE(vegam_cache_info);

		break;

	case CHIP_VEGA10:

	case CHIP_VEGA12:

	case CHIP_VEGA20:

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

+20 −0
Original line number Diff line number Diff line
@@ -232,6 +232,23 @@ static const struct kfd_device_info polaris12_device_info = { 
	.num_sdma_queues_per_engine = 2,

};



static const struct kfd_device_info vegam_device_info = {

	.asic_family = CHIP_VEGAM,

	.max_pasid_bits = 16,

	.max_no_of_hqd  = 24,

	.doorbell_size  = 4,

	.ih_ring_entry_size = 4 * sizeof(uint32_t),

	.event_interrupt_class = &event_interrupt_class_cik,

	.num_of_watch_points = 4,

	.mqd_size_aligned = MQD_SIZE_ALIGNED,

	.supports_cwsr = true,

	.needs_iommu_device = false,

	.needs_pci_atomics = true,

	.num_sdma_engines = 2,

	.num_xgmi_sdma_engines = 0,

	.num_sdma_queues_per_engine = 2,

};



static const struct kfd_device_info vega10_device_info = {

	.asic_family = CHIP_VEGA10,

	.max_pasid_bits = 16,
@@ -387,6 +404,9 @@ static const struct kfd_deviceid supported_devices[] = { 
	{ 0x6995, &polaris12_device_info },	/* Polaris12 */

	{ 0x6997, &polaris12_device_info },	/* Polaris12 */

	{ 0x699F, &polaris12_device_info },	/* Polaris12 */

	{ 0x694C, &vegam_device_info },		/* VegaM */

	{ 0x694E, &vegam_device_info },		/* VegaM */

	{ 0x694F, &vegam_device_info },		/* VegaM */

	{ 0x6860, &vega10_device_info },	/* Vega10 */

	{ 0x6861, &vega10_device_info },	/* Vega10 */

	{ 0x6862, &vega10_device_info },	/* Vega10 */

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

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

	case CHIP_POLARIS11:

	case CHIP_POLARIS12:

	case CHIP_VEGAM:

		device_queue_manager_init_vi_tonga(&dqm->asic_ops);

		break;

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

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ int kfd_init_apertures(struct kfd_process *process) 
			case CHIP_POLARIS10:

			case CHIP_POLARIS11:

			case CHIP_POLARIS12:

			case CHIP_VEGAM:

				kfd_init_apertures_vi(pdd, id);

				break;

			case CHIP_VEGA10:

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

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, 
	case CHIP_POLARIS10:

	case CHIP_POLARIS11:

	case CHIP_POLARIS12:

	case CHIP_VEGAM:

		kernel_queue_init_vi(&kq->ops_asic_specific);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE