drm/amdgpu: Relocate kgd2kfd function declaration (2d3d25b6) · Commits · 戴 / test

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

+43 −0

Original line number	Diff line number	Diff line
		@@ -619,4 +619,47 @@ struct kfd2kgd_calls *amdgpu_amdkfd_gfx_9_0_get_functions(void)
		{
		return NULL;
		}

		struct kfd_dev kgd2kfd_probe(struct kgd_dev kgd, struct pci_dev *pdev,
		const struct kfd2kgd_calls *f2g)
		{
		return NULL;
		}

		bool kgd2kfd_device_init(struct kfd_dev *kfd,
		const struct kgd2kfd_shared_resources *gpu_resources)
		{
		return false;
		}

		void kgd2kfd_device_exit(struct kfd_dev *kfd)
		{
		}

		void kgd2kfd_exit(void)
		{
		}

		void kgd2kfd_suspend(struct kfd_dev *kfd)
		{
		}

		int kgd2kfd_resume(struct kfd_dev *kfd)
		{
		return 0;
		}

		int kgd2kfd_pre_reset(struct kfd_dev *kfd)
		{
		return 0;
		}

		int kgd2kfd_post_reset(struct kfd_dev *kfd)
		{
		return 0;
		}

		void kgd2kfd_interrupt(struct kfd_dev kfd, const void ih_ring_entry)
		{
		}
		#endif

+19 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@
		#include "amdgpu_sync.h"
		#include "amdgpu_vm.h"

		extern const struct kgd2kfd_calls *kgd2kfd;
		extern uint64_t amdgpu_amdkfd_total_mem_size;

		struct amdgpu_device;
		@@ -214,4 +213,23 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd,
		void amdgpu_amdkfd_gpuvm_init_mem_limits(void);
		void amdgpu_amdkfd_unreserve_memory_limit(struct amdgpu_bo *bo);

		/* KGD2KFD callbacks */
		int kgd2kfd_init(unsigned interface_version,
		const struct kgd2kfd_calls **g2f);
		void kgd2kfd_exit(void);
		struct kfd_dev kgd2kfd_probe(struct kgd_dev kgd, struct pci_dev *pdev,
		const struct kfd2kgd_calls *f2g);
		bool kgd2kfd_device_init(struct kfd_dev *kfd,
		const struct kgd2kfd_shared_resources *gpu_resources);
		void kgd2kfd_device_exit(struct kfd_dev *kfd);
		void kgd2kfd_suspend(struct kfd_dev *kfd);
		int kgd2kfd_resume(struct kfd_dev *kfd);
		int kgd2kfd_pre_reset(struct kfd_dev *kfd);
		int kgd2kfd_post_reset(struct kfd_dev *kfd);
		void kgd2kfd_interrupt(struct kfd_dev kfd, const void ih_ring_entry);
		int kgd2kfd_quiesce_mm(struct mm_struct *mm);
		int kgd2kfd_resume_mm(struct mm_struct *mm);
		int kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,
		struct dma_fence *fence);

		#endif /* AMDGPU_AMDKFD_H_INCLUDED */

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@

		static const struct dma_fence_ops amdkfd_fence_ops;
		static atomic_t fence_seq = ATOMIC_INIT(0);
		extern const struct kgd2kfd_calls *kgd2kfd;

		/* Eviction Fence
		* Fence helper functions to deal with KFD memory eviction.

+2 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,8 @@
		*/
		#define AMDGPU_USERPTR_RESTORE_DELAY_MS 1

		extern const struct kgd2kfd_calls *kgd2kfd;

		/* Impose limit on how much memory KFD can use */
		static struct {
		uint64_t max_system_mem_limit;

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <linux/sched.h>
		#include <linux/device.h>
		#include "kfd_priv.h"
		#include "amdgpu_amdkfd.h"

		static const struct kgd2kfd_calls kgd2kfd = {
		.exit = kgd2kfd_exit,
		@@ -104,7 +105,6 @@ int kgd2kfd_init(unsigned int interface_version,

		return 0;
		}
		EXPORT_SYMBOL(kgd2kfd_init);

		void kgd2kfd_exit(void)
		{