Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 846a44d7 authored by Gang Ba's avatar Gang Ba Committed by Alex Deucher
Browse files

drm/amdkfd: Added Vega12 and Polaris12 for KFD. 



Add Vega12 and Polaris12 device info and device IDs to KFD.

Signed-off-by: default avatarGang Ba <gaba@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4e6c6fc1

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

+2 −0
Original line number Diff line number Diff line
@@ -73,9 +73,11 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev) 
	case CHIP_FIJI:

	case CHIP_POLARIS10:

	case CHIP_POLARIS11:

	case CHIP_POLARIS12:

		kfd2kgd = amdgpu_amdkfd_gfx_8_0_get_functions();

		break;

	case CHIP_VEGA10:

	case CHIP_VEGA12:

	case CHIP_VEGA20:

	case CHIP_RAVEN:

		kfd2kgd = amdgpu_amdkfd_gfx_9_0_get_functions();

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

+2 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,8 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	byte_align = (adev->family == AMDGPU_FAMILY_VI &&

			adev->asic_type != CHIP_FIJI &&

			adev->asic_type != CHIP_POLARIS10 &&

			adev->asic_type != CHIP_POLARIS11) ?

			adev->asic_type != CHIP_POLARIS11 &&

			adev->asic_type != CHIP_POLARIS12) ?

			VI_BO_SIZE_ALIGN : 1;



	mapping_flags = AMDGPU_VM_PAGE_READABLE;

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

+6 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static struct kfd_gpu_cache_info carrizo_cache_info[] = { 
#define fiji_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

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

#define vega10_cache_info carrizo_cache_info

#define raven_cache_info carrizo_cache_info
@@ -647,7 +648,12 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, 
		pcache_info = polaris11_cache_info;

		num_of_cache_types = ARRAY_SIZE(polaris11_cache_info);

		break;

	case CHIP_POLARIS12:

		pcache_info = polaris12_cache_info;

		num_of_cache_types = ARRAY_SIZE(polaris12_cache_info);

		break;

	case CHIP_VEGA10:

	case CHIP_VEGA12:

	case CHIP_VEGA20:

		pcache_info = vega10_cache_info;

		num_of_cache_types = ARRAY_SIZE(vega10_cache_info);

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

+45 −0
Original line number Diff line number Diff line
@@ -205,6 +205,22 @@ static const struct kfd_device_info polaris11_device_info = { 
	.num_sdma_queues_per_engine = 2,

};



static const struct kfd_device_info polaris12_device_info = {

	.asic_family = CHIP_POLARIS12,

	.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_sdma_queues_per_engine = 2,

};



static const struct kfd_device_info vega10_device_info = {

	.asic_family = CHIP_VEGA10,

	.max_pasid_bits = 16,
@@ -237,6 +253,22 @@ static const struct kfd_device_info vega10_vf_device_info = { 
	.num_sdma_queues_per_engine = 2,

};



static const struct kfd_device_info vega12_device_info = {

	.asic_family = CHIP_VEGA12,

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

	.supports_cwsr = true,

	.needs_iommu_device = false,

	.needs_pci_atomics = false,

	.num_sdma_engines = 2,

	.num_sdma_queues_per_engine = 2,

};



static const struct kfd_device_info vega20_device_info = {

	.asic_family = CHIP_VEGA20,

	.max_pasid_bits = 16,
@@ -331,6 +363,14 @@ static const struct kfd_deviceid supported_devices[] = { 
	{ 0x67EB, &polaris11_device_info },	/* Polaris11 */

	{ 0x67EF, &polaris11_device_info },	/* Polaris11 */

	{ 0x67FF, &polaris11_device_info },	/* Polaris11 */

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

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

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

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

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

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

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

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

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

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

	{ 0x6862, &vega10_device_info },	/* Vega10 */
@@ -340,6 +380,11 @@ static const struct kfd_deviceid supported_devices[] = { 
	{ 0x6868, &vega10_device_info },	/* Vega10 */

	{ 0x686C, &vega10_vf_device_info },	/* Vega10  vf*/

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

	{ 0x69A0, &vega12_device_info },	/* Vega12 */

	{ 0x69A1, &vega12_device_info },	/* Vega12 */

	{ 0x69A2, &vega12_device_info },	/* Vega12 */

	{ 0x69A3, &vega12_device_info },	/* Vega12 */

	{ 0x69AF, &vega12_device_info },	/* Vega12 */

	{ 0x66a0, &vega20_device_info },	/* Vega20 */

	{ 0x66a1, &vega20_device_info },	/* Vega20 */

	{ 0x66a2, &vega20_device_info },	/* Vega20 */

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

+2 −0
Original line number Diff line number Diff line
@@ -1741,10 +1741,12 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev) 
	case CHIP_FIJI:

	case CHIP_POLARIS10:

	case CHIP_POLARIS11:

	case CHIP_POLARIS12:

		device_queue_manager_init_vi_tonga(&dqm->asic_ops);

		break;



	case CHIP_VEGA10:

	case CHIP_VEGA12:

	case CHIP_VEGA20:

	case CHIP_RAVEN:

		device_queue_manager_init_v9(&dqm->asic_ops);