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

Commit 155494db authored by Felix Kuehling's avatar Felix Kuehling Committed by Oded Gabbay
Browse files

drm/amdgpu: Update kgd2kfd_shared_resources for dGPU support 



Add GPUVM size and DRM render node. Also add function to query the
VMID mask to avoid hard-coding it in multiple places later.

v2: cut off GPUVM size at the VA hole

Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent d8d019cc

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

+18 −2
Original line number Original line Diff line number Diff line
@@ -30,6 +30,8 @@ 
const struct kgd2kfd_calls *kgd2kfd;

const struct kgd2kfd_calls *kgd2kfd;

bool (*kgd2kfd_init_p)(unsigned int, const struct kgd2kfd_calls**);

bool (*kgd2kfd_init_p)(unsigned int, const struct kgd2kfd_calls**);





static const unsigned int compute_vmid_bitmap = 0xFF00;



int amdgpu_amdkfd_init(void)

int amdgpu_amdkfd_init(void)

{

{

	int ret;

	int ret;
@@ -137,9 +139,13 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
	int last_valid_bit;

	int last_valid_bit;

	if (adev->kfd) {

	if (adev->kfd) {

		struct kgd2kfd_shared_resources gpu_resources = {

		struct kgd2kfd_shared_resources gpu_resources = {

			.compute_vmid_bitmap = 0xFF00,

			.compute_vmid_bitmap = compute_vmid_bitmap,

			.num_pipe_per_mec = adev->gfx.mec.num_pipe_per_mec,

			.num_pipe_per_mec = adev->gfx.mec.num_pipe_per_mec,

			.num_queue_per_pipe = adev->gfx.mec.num_queue_per_pipe

			.num_queue_per_pipe = adev->gfx.mec.num_queue_per_pipe,

			.gpuvm_size = min(adev->vm_manager.max_pfn

					  << AMDGPU_GPU_PAGE_SHIFT,

					  AMDGPU_VA_HOLE_START),

			.drm_render_minor = adev->ddev->render->index

		};

		};





		/* this is going to have a few of the MSBs set that we need to

		/* this is going to have a few of the MSBs set that we need to
@@ -359,3 +365,13 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd) 




	return amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

	return amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

}

}



bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid)

{

	if (adev->kfd) {

		if ((1 << vmid) & compute_vmid_bitmap)

			return true;

	}



	return false;

}

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,8 @@ void amdgpu_amdkfd_device_fini(struct amdgpu_device *adev); 
struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void);





bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);



/* Shared API */

/* Shared API */

int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

			void **mem_obj, uint64_t *gpu_addr,

			void **mem_obj, uint64_t *gpu_addr,

drivers/gpu/drm/amd/include/kgd_kfd_interface.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -108,6 +108,12 @@ struct kgd2kfd_shared_resources { 




	/* Number of bytes at start of aperture reserved for KGD. */

	/* Number of bytes at start of aperture reserved for KGD. */

	size_t doorbell_start_offset;

	size_t doorbell_start_offset;



	/* GPUVM address space size in bytes */

	uint64_t gpuvm_size;



	/* Minor device number of the render node */

	int drm_render_minor;

};

};





struct tile_config {

struct tile_config {