Commit 87ded5ca authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: move vram usage by vbios to mman (v2) 



It's related to the memory manager so move it there.

v2: inline the structure

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 72de33f8

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

+0 −12
Original line number Diff line number Diff line
@@ -651,16 +651,6 @@ struct amdgpu_atcs { 
	struct amdgpu_atcs_functions functions;

};



/*

 * Firmware VRAM reservation

 */

struct amdgpu_fw_vram_usage {

	u64 start_offset;

	u64 size;

	struct amdgpu_bo *reserved_bo;

	void *va;

};



/*

 * CGS

 */
@@ -944,8 +934,6 @@ struct amdgpu_device { 
	struct delayed_work     delayed_init_work;



	struct amdgpu_virt	virt;

	/* firmware VRAM reservation */

	struct amdgpu_fw_vram_usage fw_vram_usage;



	/* link all shadow bo */

	struct list_head                shadow_list;

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

+2 −2
Original line number Diff line number Diff line
@@ -1786,9 +1786,9 @@ static int amdgpu_atombios_allocate_fb_scratch(struct amdgpu_device *adev) 
			(uint32_t)(ATOM_VRAM_BLOCK_SRIOV_MSG_SHARE_RESERVATION <<

			ATOM_VRAM_OPERATION_FLAGS_SHIFT)) {

			/* Firmware request VRAM reservation for SR-IOV */

			adev->fw_vram_usage.start_offset = (start_addr &

			adev->mman.fw_vram_usage_start_offset = (start_addr &

				(~ATOM_VRAM_OPERATION_FLAGS_MASK)) << 10;

			adev->fw_vram_usage.size = size << 10;

			adev->mman.fw_vram_usage_size = size << 10;

			/* Use the default scratch size */

			usage_bytes = 0;

		} else {

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

+2 −2
Original line number Diff line number Diff line
@@ -89,9 +89,9 @@ int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev) 
			(uint32_t)(ATOM_VRAM_BLOCK_SRIOV_MSG_SHARE_RESERVATION <<

			ATOM_VRAM_OPERATION_FLAGS_SHIFT)) {

			/* Firmware request VRAM reservation for SR-IOV */

			adev->fw_vram_usage.start_offset = (start_addr &

			adev->mman.fw_vram_usage_start_offset = (start_addr &

				(~ATOM_VRAM_OPERATION_FLAGS_MASK)) << 10;

			adev->fw_vram_usage.size = size << 10;

			adev->mman.fw_vram_usage_size = size << 10;

			/* Use the default scratch size */

			usage_bytes = 0;

		} else {

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

+10 −10
Original line number Diff line number Diff line
@@ -1766,8 +1766,8 @@ static struct ttm_bo_driver amdgpu_bo_driver = { 
 */

static void amdgpu_ttm_fw_reserve_vram_fini(struct amdgpu_device *adev)

{

	amdgpu_bo_free_kernel(&adev->fw_vram_usage.reserved_bo,

		NULL, &adev->fw_vram_usage.va);

	amdgpu_bo_free_kernel(&adev->mman.fw_vram_usage_reserved_bo,

		NULL, &adev->mman.fw_vram_usage_va);

}



/**
@@ -1781,19 +1781,19 @@ static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev) 
{

	uint64_t vram_size = adev->gmc.visible_vram_size;



	adev->fw_vram_usage.va = NULL;

	adev->fw_vram_usage.reserved_bo = NULL;

	adev->mman.fw_vram_usage_va = NULL;

	adev->mman.fw_vram_usage_reserved_bo = NULL;



	if (adev->fw_vram_usage.size == 0 ||

	    adev->fw_vram_usage.size > vram_size)

	if (adev->mman.fw_vram_usage_size == 0 ||

	    adev->mman.fw_vram_usage_size > vram_size)

		return 0;



	return amdgpu_bo_create_kernel_at(adev,

					  adev->fw_vram_usage.start_offset,

					  adev->fw_vram_usage.size,

					  adev->mman.fw_vram_usage_start_offset,

					  adev->mman.fw_vram_usage_size,

					  AMDGPU_GEM_DOMAIN_VRAM,

					  &adev->fw_vram_usage.reserved_bo,

					  &adev->fw_vram_usage.va);

					  &adev->mman.fw_vram_usage_reserved_bo,

					  &adev->mman.fw_vram_usage_va);

}



/*

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

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ struct amdgpu_mman { 
	uint8_t				*discovery_bin;

	uint32_t			discovery_tmr_size;

	struct amdgpu_bo		*discovery_memory;



	/* firmware VRAM reservation */

	u64		fw_vram_usage_start_offset;

	u64		fw_vram_usage_size;

	struct amdgpu_bo	*fw_vram_usage_reserved_bo;

	void		*fw_vram_usage_va;

};



struct amdgpu_copy_mem {