Commit 36e22d59 authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher
Browse files

drm/amdkfd: Add Aldebaran KFD support 



Add initial KFD support.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "amdgpu_amdkfd_gfx_v9.h"

#include "gfxhub_v1_0.h"

#include "mmhub_v9_4.h"

#include "mmhub_v1_7.h"



#define HQD_N_REGS 56

#define DUMP_REG(addr) do {				\

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

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ static uint64_t get_pte_flags(struct amdgpu_device *adev, struct kgd_mem *mem) 


	switch (adev->asic_type) {

	case CHIP_ARCTURUS:

	case CHIP_ALDEBARAN:

		if (mem->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) {

			if (bo_adev == adev)

				mapping_flags |= coherent ?

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

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

	case CHIP_VEGA20:

	case CHIP_ARCTURUS:

	case CHIP_ALDEBARAN:

		pcache_info = vega10_cache_info;

		num_of_cache_types = ARRAY_SIZE(vega10_cache_info);

		break;

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

+22 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static const struct kfd2kgd_calls *kfd2kgd_funcs[] = { 
	[CHIP_VEGA20] = &gfx_v9_kfd2kgd,

	[CHIP_RENOIR] = &gfx_v9_kfd2kgd,

	[CHIP_ARCTURUS] = &arcturus_kfd2kgd,

	[CHIP_ALDEBARAN] = &arcturus_kfd2kgd,

	[CHIP_NAVI10] = &gfx_v10_kfd2kgd,

	[CHIP_NAVI12] = &gfx_v10_kfd2kgd,

	[CHIP_NAVI14] = &gfx_v10_kfd2kgd,
@@ -392,6 +393,24 @@ static const struct kfd_device_info arcturus_device_info = { 
	.num_sdma_queues_per_engine = 8,

};



static const struct kfd_device_info aldebaran_device_info = {

	.asic_family = CHIP_ALDEBARAN,

	.asic_name = "aldebaran",

	.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_xgmi_sdma_engines = 3,

	.num_sdma_queues_per_engine = 8,

};



static const struct kfd_device_info renoir_device_info = {

	.asic_family = CHIP_RENOIR,

	.asic_name = "renoir",
@@ -556,6 +575,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { 
	[CHIP_VEGA20] = {&vega20_device_info, NULL},

	[CHIP_RENOIR] = {&renoir_device_info, NULL},

	[CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info},

	[CHIP_ALDEBARAN] = {&aldebaran_device_info, NULL},

	[CHIP_NAVI10] = {&navi10_device_info, NULL},

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

	[CHIP_NAVI14] = {&navi14_device_info, NULL},
@@ -636,7 +656,8 @@ static void kfd_cwsr_init(struct kfd_dev *kfd) 
			BUILD_BUG_ON(sizeof(cwsr_trap_gfx8_hex) > PAGE_SIZE);

			kfd->cwsr_isa = cwsr_trap_gfx8_hex;

			kfd->cwsr_isa_size = sizeof(cwsr_trap_gfx8_hex);

		} else if (kfd->device_info->asic_family == CHIP_ARCTURUS) {

		} else if (kfd->device_info->asic_family == CHIP_ARCTURUS

			|| kfd->device_info->asic_family == CHIP_ALDEBARAN) {

			BUILD_BUG_ON(sizeof(cwsr_trap_arcturus_hex) > PAGE_SIZE);

			kfd->cwsr_isa = cwsr_trap_arcturus_hex;

			kfd->cwsr_isa_size = sizeof(cwsr_trap_arcturus_hex);

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

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

	case CHIP_RENOIR:

	case CHIP_ARCTURUS:

	case CHIP_ALDEBARAN:

		device_queue_manager_init_v9(&dqm->asic_ops);

		break;

	case CHIP_NAVI10: