Commit 228ce176 authored by Rajneesh Bhardwaj's avatar Rajneesh Bhardwaj Committed by Alex Deucher
Browse files

drm/amdgpu: Handle VRAM dependencies on GFXIP9.4.3 



[For 1P NPS1 mode driver bringup]

Changes required to initialize the amdgpu driver with frontdoor firmware
loading and discovery=2 with the native mode SBIOS that enables CPU GPU
unified interleaved memory.

sudo modprobe amdgpu discovery=2

Once PSP TMR region is reported via the ACPI interface, the dependency
on the ip_discovery.bin will be removed.

Choice of where to allocate driver table is given to each IP version. In
general, both GTT and VRAM domains will be considered. If one of the
tables has a strict restriction for VRAM domain, then only VRAM domain
is considered.

Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
(lijo: Modified the handling for SMU Tables)
Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarRajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9faf929f

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

+2 −1
Original line number Diff line number Diff line
@@ -2292,8 +2292,9 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct amdgpu_device *adev, 
	(*mem)->dmabuf = dma_buf;

	(*mem)->bo = bo;

	(*mem)->va = va;

	(*mem)->domain = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) ?

	(*mem)->domain = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) && !adev->gmc.is_app_apu ?

		AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT;



	(*mem)->mapped_to_gpu_memory = 0;

	(*mem)->process_info = avm->process_info;

	add_kgd_mem_to_kfd_bo_list(*mem, avm->process_info, false);

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

+1 −1
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ static const char * const amdgpu_vram_names[] = { 
int amdgpu_bo_init(struct amdgpu_device *adev)

{

	/* On A+A platform, VRAM can be mapped as WB */

	if (!adev->gmc.xgmi.connected_to_cpu) {

	if (!adev->gmc.xgmi.connected_to_cpu && !adev->gmc.is_app_apu) {

		/* reserve PAT memory space to WC for VRAM */

		int r = arch_io_reserve_memtype_wc(adev->gmc.aper_base,

				adev->gmc.aper_size);

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

+4 −2
Original line number Diff line number Diff line
@@ -476,7 +476,8 @@ static int psp_sw_init(void *handle) 
		return ret;



	ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE,

				      AMDGPU_GEM_DOMAIN_VRAM,

				      AMDGPU_GEM_DOMAIN_VRAM |

				      AMDGPU_GEM_DOMAIN_GTT,

				      &psp->fence_buf_bo,

				      &psp->fence_buf_mc_addr,

				      &psp->fence_buf);
@@ -484,7 +485,8 @@ static int psp_sw_init(void *handle) 
		goto failed1;



	ret = amdgpu_bo_create_kernel(adev, PSP_CMD_BUFFER_SIZE, PAGE_SIZE,

				      AMDGPU_GEM_DOMAIN_VRAM,

				      AMDGPU_GEM_DOMAIN_VRAM |

				      AMDGPU_GEM_DOMAIN_GTT,

				      &psp->cmd_buf_bo, &psp->cmd_buf_mc_addr,

				      (void **)&psp->cmd_buf_mem);

	if (ret)

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

+53 −36
Original line number Diff line number Diff line
@@ -1708,8 +1708,10 @@ static int amdgpu_ttm_reserve_tmr(struct amdgpu_device *adev) 
		ctx->init = PSP_MEM_TRAIN_RESERVE_SUCCESS;

	}



	if (!adev->gmc.is_app_apu) {

		ret = amdgpu_bo_create_kernel_at(adev,

					 adev->gmc.real_vram_size - adev->mman.discovery_tmr_size,

						 adev->gmc.real_vram_size -

						 adev->mman.discovery_tmr_size,

						 adev->mman.discovery_tmr_size,

						 &adev->mman.discovery_memory,

						 NULL);
@@ -1718,6 +1720,9 @@ static int amdgpu_ttm_reserve_tmr(struct amdgpu_device *adev) 
			amdgpu_bo_free_kernel(&adev->mman.discovery_memory, NULL, NULL);

			return ret;

		}

	} else {

		DRM_DEBUG_DRIVER("backdoor fw loading path for PSP TMR, no reservation needed\n");

	}



	return 0;

}
@@ -1765,10 +1770,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
		adev->mman.aper_base_kaddr = ioremap_cache(adev->gmc.aper_base,

				adev->gmc.visible_vram_size);



	else

	else if (!adev->gmc.is_app_apu)

#endif

		adev->mman.aper_base_kaddr = ioremap_wc(adev->gmc.aper_base,

				adev->gmc.visible_vram_size);

	else

		DRM_DEBUG_DRIVER("No need to ioremap when real vram size is 0\n");

#endif



	/*
@@ -1803,23 +1810,32 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	 * This is used for VGA emulation and pre-OS scanout buffers to

	 * avoid display artifacts while transitioning between pre-OS

	 * and driver.  */

	r = amdgpu_bo_create_kernel_at(adev, 0, adev->mman.stolen_vga_size,

	if (!adev->gmc.is_app_apu) {

		r = amdgpu_bo_create_kernel_at(adev, 0,

					       adev->mman.stolen_vga_size,

					       &adev->mman.stolen_vga_memory,

					       NULL);

		if (r)

			return r;



		r = amdgpu_bo_create_kernel_at(adev, adev->mman.stolen_vga_size,

					       adev->mman.stolen_extended_size,

					       &adev->mman.stolen_extended_memory,

					       NULL);



		if (r)

			return r;

	r = amdgpu_bo_create_kernel_at(adev, adev->mman.stolen_reserved_offset,



		r = amdgpu_bo_create_kernel_at(adev,

					       adev->mman.stolen_reserved_offset,

					       adev->mman.stolen_reserved_size,

					       &adev->mman.stolen_reserved_memory,

					       NULL);

		if (r)

			return r;

	} else {

		DRM_DEBUG_DRIVER("Skipped stolen memory reservation\n");

	}



	DRM_INFO("amdgpu: %uM of VRAM memory ready\n",

		 (unsigned) (adev->gmc.real_vram_size / (1024 * 1024)));
@@ -1866,7 +1882,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
		DRM_ERROR("Failed initializing oa heap.\n");

		return r;

	}



	if (amdgpu_bo_create_kernel(adev, PAGE_SIZE, PAGE_SIZE,

				AMDGPU_GEM_DOMAIN_GTT,

				&adev->mman.sdma_access_bo, NULL,
@@ -1887,6 +1902,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) 


	amdgpu_ttm_training_reserve_vram_fini(adev);

	/* return the stolen vga memory back to VRAM */

	if (!adev->gmc.is_app_apu) {

		amdgpu_bo_free_kernel(&adev->mman.stolen_vga_memory, NULL, NULL);

		amdgpu_bo_free_kernel(&adev->mman.stolen_extended_memory, NULL, NULL);

		/* return the IP Discovery TMR memory back to VRAM */
@@ -1894,6 +1910,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) 
		if (adev->mman.stolen_reserved_size)

			amdgpu_bo_free_kernel(&adev->mman.stolen_reserved_memory,

					      NULL, NULL);

	}

	amdgpu_bo_free_kernel(&adev->mman.sdma_access_bo, NULL,

					&adev->mman.sdma_access_ptr);

	amdgpu_ttm_fw_reserve_vram_fini(adev);
@@ -1935,7 +1952,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable) 
	int r;



	if (!adev->mman.initialized || amdgpu_in_reset(adev) ||

	    adev->mman.buffer_funcs_enabled == enable)

	    adev->mman.buffer_funcs_enabled == enable || adev->gmc.is_app_apu)

		return;



	if (enable) {

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

+6 −1
Original line number Diff line number Diff line
@@ -512,7 +512,12 @@ int amdgpu_vm_pt_create(struct amdgpu_device *adev, struct amdgpu_vm *vm, 


	bp.size = amdgpu_vm_pt_size(adev, level);

	bp.byte_align = AMDGPU_GPU_PAGE_SIZE;



	if (!adev->gmc.is_app_apu)

		bp.domain = AMDGPU_GEM_DOMAIN_VRAM;

	else

		bp.domain = AMDGPU_GEM_DOMAIN_GTT;



	bp.domain = amdgpu_bo_get_preferred_domain(adev, bp.domain);

	bp.flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS |

		AMDGPU_GEM_CREATE_CPU_GTT_USWC;