|
@@ -193,7 +193,8 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
|
|
|
/* add another 512KB for all other allocations on gart (HPD, fences) */
|
|
|
size += 512 * 1024;
|
|
|
|
|
|
- if (kfd2kgd->init_sa_manager(kfd->kgd, size)) {
|
|
|
+ if (kfd2kgd->init_gtt_mem_allocation(kfd->kgd, size, &kfd->gtt_mem,
|
|
|
+ &kfd->gtt_start_gpu_addr, &kfd->gtt_start_cpu_ptr)) {
|
|
|
dev_err(kfd_device,
|
|
|
"Could not allocate %d bytes for device (%x:%x)\n",
|
|
|
size, kfd->pdev->vendor, kfd->pdev->device);
|
|
@@ -204,6 +205,13 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
|
|
|
"Allocated %d bytes on gart for device(%x:%x)\n",
|
|
|
size, kfd->pdev->vendor, kfd->pdev->device);
|
|
|
|
|
|
+ /* Initialize GTT sa with 512 byte chunk size */
|
|
|
+ if (kfd_gtt_sa_init(kfd, size, 512) != 0) {
|
|
|
+ dev_err(kfd_device,
|
|
|
+ "Error initializing gtt sub-allocator\n");
|
|
|
+ goto kfd_gtt_sa_init_error;
|
|
|
+ }
|
|
|
+
|
|
|
kfd_doorbell_init(kfd);
|
|
|
|
|
|
if (kfd_topology_add_device(kfd) != 0) {
|
|
@@ -262,7 +270,9 @@ device_iommu_pasid_error:
|
|
|
kfd_interrupt_error:
|
|
|
kfd_topology_remove_device(kfd);
|
|
|
kfd_topology_add_device_error:
|
|
|
- kfd2kgd->fini_sa_manager(kfd->kgd);
|
|
|
+ kfd_gtt_sa_fini(kfd);
|
|
|
+kfd_gtt_sa_init_error:
|
|
|
+ kfd2kgd->free_gtt_mem(kfd->kgd, kfd->gtt_mem);
|
|
|
dev_err(kfd_device,
|
|
|
"device (%x:%x) NOT added due to errors\n",
|
|
|
kfd->pdev->vendor, kfd->pdev->device);
|
|
@@ -277,6 +287,8 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd)
|
|
|
amd_iommu_free_device(kfd->pdev);
|
|
|
kfd_interrupt_exit(kfd);
|
|
|
kfd_topology_remove_device(kfd);
|
|
|
+ kfd_gtt_sa_fini(kfd);
|
|
|
+ kfd2kgd->free_gtt_mem(kfd->kgd, kfd->gtt_mem);
|
|
|
}
|
|
|
|
|
|
kfree(kfd);
|