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

Commit 64c7f8cf authored by Ben Goz's avatar Ben Goz Committed by Oded Gabbay
Browse files

amdkfd: Add device queue manager module 



The queue scheduler divides into two sections, one section is process bounded
and the other section is device bounded.
The device bounded section is handled by this module.
The DQM module handles queue setup, update and tear-down from the device side.
It also supports suspend/resume operation.

v3: Changed device_init, added the use of the new gart allocation functions an
Added documentation.

v4:

Fixed a race in DQM queue scheduler where dqm->lock must be held when accessing
dqm->queue_count and dqm->processes_count. This fixes runlist IB allocation
failures when DQM is under load.

Fixed race in DQM queue destruction where queues being destroyed must be
removed from qpd->queues_list prior to preemption, or concurrent queue
creation activity may reschedule them while their MQD is destroyed.

Fixed EOP queue size setting in CP_HPD_EOP_CONTROL, because the size is
specified as (log2(size_dwords)-1). The previous calculation assumed the
size was specified in bytes, which caused interference between EOP queues
when multiple MEC pipelines were active.

v5:

Move amdkfd from drm/radeon/ to drm/amd/
Change format of mqd structure to match latest KV firmware
Add support for AQL queues creation to enable working with open-source HSA
runtime
Remove unused unmap_queue function
Various fixes (Style, typos)

Signed-off-by: default avatarBen Goz <ben.goz@amd.com>
Signed-off-by: default avatarJay Cornwall <jay.cornwall@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@amd.com>
parent 45102048

drivers/gpu/drm/amd/amdkfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ amdkfd-y := kfd_module.o kfd_device.o kfd_chardev.o kfd_topology.o \ 
		kfd_pasid.o kfd_doorbell.o kfd_flat_memory.o \

		kfd_process.o kfd_queue.o kfd_mqd_manager.o \

		kfd_kernel_queue.o kfd_packet_manager.o \

		kfd_process_queue_manager.o

		kfd_process_queue_manager.o kfd_device_queue_manager.o



obj-$(CONFIG_HSA_AMD)	+= amdkfd.o

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

+28 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/pci.h>

#include <linux/slab.h>

#include "kfd_priv.h"

#include "kfd_device_queue_manager.h"



#define MQD_SIZE_ALIGNED 768
@@ -199,12 +200,34 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
	amd_iommu_set_invalidate_ctx_cb(kfd->pdev,

						iommu_pasid_shutdown_callback);



	kfd->dqm = device_queue_manager_init(kfd);

	if (!kfd->dqm) {

		dev_err(kfd_device,

			"Error initializing queue manager for device (%x:%x)\n",

			kfd->pdev->vendor, kfd->pdev->device);

		goto device_queue_manager_error;

	}



	if (kfd->dqm->start(kfd->dqm) != 0) {

		dev_err(kfd_device,

			"Error starting queuen manager for device (%x:%x)\n",

			kfd->pdev->vendor, kfd->pdev->device);

		goto dqm_start_error;

	}



	kfd->init_complete = true;

	dev_info(kfd_device, "added device (%x:%x)\n", kfd->pdev->vendor,

		 kfd->pdev->device);



	pr_debug("kfd: Starting kfd with the following scheduling policy %d\n",

		sched_policy);



	goto out;



dqm_start_error:

	device_queue_manager_uninit(kfd->dqm);

device_queue_manager_error:

	amd_iommu_free_device(kfd->pdev);

device_iommu_pasid_error:

	kfd_topology_remove_device(kfd);

kfd_topology_add_device_error:
@@ -219,6 +242,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
void kgd2kfd_device_exit(struct kfd_dev *kfd)

{

	if (kfd->init_complete) {

		device_queue_manager_uninit(kfd->dqm);

		amd_iommu_free_device(kfd->pdev);

		kfd_topology_remove_device(kfd);

	}
@@ -230,9 +254,11 @@ void kgd2kfd_suspend(struct kfd_dev *kfd) 
{

	BUG_ON(kfd == NULL);



	if (kfd->init_complete)

	if (kfd->init_complete) {

		kfd->dqm->stop(kfd->dqm);

		amd_iommu_free_device(kfd->pdev);

	}

}



int kgd2kfd_resume(struct kfd_dev *kfd)

{
@@ -249,6 +275,7 @@ int kgd2kfd_resume(struct kfd_dev *kfd) 
			return -ENXIO;

		amd_iommu_set_invalidate_ctx_cb(kfd->pdev,

						iommu_pasid_shutdown_callback);

		kfd->dqm->start(kfd->dqm);

	}



	return 0;