drm/amdkfd: Vega20 bring up on amdkfd side
Add Vega20 device IDs, device info and enable it in KFD. Signed-off-by: Shaoyun Liu <Shaoyun.Liu@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
This commit is contained in:
parent
ba0f2841d5
commit
22a3a2941b
@ -647,6 +647,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
|
|||||||
num_of_cache_types = ARRAY_SIZE(polaris11_cache_info);
|
num_of_cache_types = ARRAY_SIZE(polaris11_cache_info);
|
||||||
break;
|
break;
|
||||||
case CHIP_VEGA10:
|
case CHIP_VEGA10:
|
||||||
|
case CHIP_VEGA20:
|
||||||
pcache_info = vega10_cache_info;
|
pcache_info = vega10_cache_info;
|
||||||
num_of_cache_types = ARRAY_SIZE(vega10_cache_info);
|
num_of_cache_types = ARRAY_SIZE(vega10_cache_info);
|
||||||
break;
|
break;
|
||||||
|
@ -236,6 +236,22 @@ static const struct kfd_device_info vega10_vf_device_info = {
|
|||||||
.num_sdma_queues_per_engine = 2,
|
.num_sdma_queues_per_engine = 2,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct kfd_device_info vega20_device_info = {
|
||||||
|
.asic_family = CHIP_VEGA20,
|
||||||
|
.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 = true,
|
||||||
|
.num_sdma_engines = 2,
|
||||||
|
.num_sdma_queues_per_engine = 8,
|
||||||
|
};
|
||||||
|
|
||||||
struct kfd_deviceid {
|
struct kfd_deviceid {
|
||||||
unsigned short did;
|
unsigned short did;
|
||||||
const struct kfd_device_info *device_info;
|
const struct kfd_device_info *device_info;
|
||||||
@ -323,6 +339,12 @@ static const struct kfd_deviceid supported_devices[] = {
|
|||||||
{ 0x6868, &vega10_device_info }, /* Vega10 */
|
{ 0x6868, &vega10_device_info }, /* Vega10 */
|
||||||
{ 0x686C, &vega10_vf_device_info }, /* Vega10 vf*/
|
{ 0x686C, &vega10_vf_device_info }, /* Vega10 vf*/
|
||||||
{ 0x687F, &vega10_device_info }, /* Vega10 */
|
{ 0x687F, &vega10_device_info }, /* Vega10 */
|
||||||
|
{ 0x66a0, &vega20_device_info }, /* Vega20 */
|
||||||
|
{ 0x66a1, &vega20_device_info }, /* Vega20 */
|
||||||
|
{ 0x66a2, &vega20_device_info }, /* Vega20 */
|
||||||
|
{ 0x66a3, &vega20_device_info }, /* Vega20 */
|
||||||
|
{ 0x66a7, &vega20_device_info }, /* Vega20 */
|
||||||
|
{ 0x66af, &vega20_device_info } /* Vega20 */
|
||||||
};
|
};
|
||||||
|
|
||||||
static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
|
static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
|
||||||
|
@ -1733,6 +1733,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case CHIP_VEGA10:
|
case CHIP_VEGA10:
|
||||||
|
case CHIP_VEGA20:
|
||||||
case CHIP_RAVEN:
|
case CHIP_RAVEN:
|
||||||
device_queue_manager_init_v9(&dqm->asic_ops);
|
device_queue_manager_init_v9(&dqm->asic_ops);
|
||||||
break;
|
break;
|
||||||
|
@ -400,6 +400,7 @@ int kfd_init_apertures(struct kfd_process *process)
|
|||||||
kfd_init_apertures_vi(pdd, id);
|
kfd_init_apertures_vi(pdd, id);
|
||||||
break;
|
break;
|
||||||
case CHIP_VEGA10:
|
case CHIP_VEGA10:
|
||||||
|
case CHIP_VEGA20:
|
||||||
case CHIP_RAVEN:
|
case CHIP_RAVEN:
|
||||||
kfd_init_apertures_v9(pdd, id);
|
kfd_init_apertures_v9(pdd, id);
|
||||||
break;
|
break;
|
||||||
|
@ -322,6 +322,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case CHIP_VEGA10:
|
case CHIP_VEGA10:
|
||||||
|
case CHIP_VEGA20:
|
||||||
case CHIP_RAVEN:
|
case CHIP_RAVEN:
|
||||||
kernel_queue_init_v9(&kq->ops_asic_specific);
|
kernel_queue_init_v9(&kq->ops_asic_specific);
|
||||||
break;
|
break;
|
||||||
|
@ -39,6 +39,7 @@ struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type,
|
|||||||
case CHIP_POLARIS11:
|
case CHIP_POLARIS11:
|
||||||
return mqd_manager_init_vi_tonga(type, dev);
|
return mqd_manager_init_vi_tonga(type, dev);
|
||||||
case CHIP_VEGA10:
|
case CHIP_VEGA10:
|
||||||
|
case CHIP_VEGA20:
|
||||||
case CHIP_RAVEN:
|
case CHIP_RAVEN:
|
||||||
return mqd_manager_init_v9(type, dev);
|
return mqd_manager_init_v9(type, dev);
|
||||||
default:
|
default:
|
||||||
|
@ -229,6 +229,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm)
|
|||||||
pm->pmf = &kfd_vi_pm_funcs;
|
pm->pmf = &kfd_vi_pm_funcs;
|
||||||
break;
|
break;
|
||||||
case CHIP_VEGA10:
|
case CHIP_VEGA10:
|
||||||
|
case CHIP_VEGA20:
|
||||||
case CHIP_RAVEN:
|
case CHIP_RAVEN:
|
||||||
pm->pmf = &kfd_v9_pm_funcs;
|
pm->pmf = &kfd_v9_pm_funcs;
|
||||||
break;
|
break;
|
||||||
|
@ -1278,6 +1278,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
|
|||||||
HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK);
|
HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK);
|
||||||
break;
|
break;
|
||||||
case CHIP_VEGA10:
|
case CHIP_VEGA10:
|
||||||
|
case CHIP_VEGA20:
|
||||||
case CHIP_RAVEN:
|
case CHIP_RAVEN:
|
||||||
dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<
|
dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<
|
||||||
HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) &
|
HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) &
|
||||||
|
Loading…
Reference in New Issue
Block a user