drm/amdgpu: move amdgpu_doorbell_get_kfd_info to amdgpu_amdkfd.c (22cb0164) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -651,12 +651,6 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT
		AMDGPU_DOORBELL64_INVALID = 0xFFFF
		} AMDGPU_DOORBELL64_ASSIGNMENT;


		void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,
		phys_addr_t *aperture_base,
		size_t *aperture_size,
		size_t *start_offset);

		/*
		* IRQS.
		*/

+33 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,39 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev)
		adev->pdev, kfd2kgd);
		}

		/**
		* amdgpu_doorbell_get_kfd_info - Report doorbell configuration required to
		* setup amdkfd
		*
		* @adev: amdgpu_device pointer
		* @aperture_base: output returning doorbell aperture base physical address
		* @aperture_size: output returning doorbell aperture size in bytes
		* @start_offset: output returning # of doorbell bytes reserved for amdgpu.
		*
		* amdgpu and amdkfd share the doorbell aperture. amdgpu sets it up,
		* takes doorbells required for its own rings and reports the setup to amdkfd.
		* amdgpu reserved doorbells are at the start of the doorbell aperture.
		*/
		static void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,
		phys_addr_t *aperture_base,
		size_t *aperture_size,
		size_t *start_offset)
		{
		/*
		* The first num_doorbells are used by amdgpu.
		* amdkfd takes whatever's left in the aperture.
		*/
		if (adev->doorbell.size > adev->doorbell.num_doorbells * sizeof(u32)) {
		*aperture_base = adev->doorbell.base;
		*aperture_size = adev->doorbell.size;
		start_offset = adev->doorbell.num_doorbells sizeof(u32);
		} else {
		*aperture_base = 0;
		*aperture_size = 0;
		*start_offset = 0;
		}
		}

		void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
		{
		int i;

+1 −32

Original line number	Diff line number	Diff line
		@@ -438,38 +438,7 @@ static void amdgpu_device_doorbell_fini(struct amdgpu_device *adev)
		adev->doorbell.ptr = NULL;
		}

		/**
		* amdgpu_doorbell_get_kfd_info - Report doorbell configuration required to
		* setup amdkfd
		*
		* @adev: amdgpu_device pointer
		* @aperture_base: output returning doorbell aperture base physical address
		* @aperture_size: output returning doorbell aperture size in bytes
		* @start_offset: output returning # of doorbell bytes reserved for amdgpu.
		*
		* amdgpu and amdkfd share the doorbell aperture. amdgpu sets it up,
		* takes doorbells required for its own rings and reports the setup to amdkfd.
		* amdgpu reserved doorbells are at the start of the doorbell aperture.
		*/
		void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev,
		phys_addr_t *aperture_base,
		size_t *aperture_size,
		size_t *start_offset)
		{
		/*
		* The first num_doorbells are used by amdgpu.
		* amdkfd takes whatever's left in the aperture.
		*/
		if (adev->doorbell.size > adev->doorbell.num_doorbells * sizeof(u32)) {
		*aperture_base = adev->doorbell.base;
		*aperture_size = adev->doorbell.size;
		start_offset = adev->doorbell.num_doorbells sizeof(u32);
		} else {
		*aperture_base = 0;
		*aperture_size = 0;
		*start_offset = 0;
		}
		}


		/*
		* amdgpu_device_wb_*()