drm/amdgpu: add vram reservation logic based on vram_usagebyfirmware_v2_2
Subsystems (2)
PATCH 1/1 drm/amdgpu: add vram reservation logic based on vram_usagebyfirmware_v2_2
Move TMR region from top of FB to 2MB for FFBM, so we need to reserve TMR region firstly to make sure TMR can be allocated at 2MB
--- .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 106 ++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 52 +++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 6 + drivers/gpu/drm/amd/include/atomfirmware.h | 56 ++++++++- 4 files changed, 192 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +83 -23
@@ -101,39 +101,99 @@ void amdgpu_atomfirmware_scratch_regs_init(struct amdgpu_device *adev) } } +static int amdgpu_atomfirmware_allocate_fb_v2_1 (struct amdgpu_device *adev, +struct vram_usagebyfirmware_v2_1 *firmware_usage_v2_1, +int *usage_bytes) +{ +uint32_t start_addr, size; + +DRM_DEBUG ("atom firmware v2_1 requested %08x %dkb fw %dkb drv\n" , +le32_to_cpu (firmware_usage_v2_1->start_address_in_kb), +le16_to_cpu (firmware_usage_v2_1->used_by_firmware_in_kb), +le16_to_cpu (firmware_usage_v2_1->used_by_driver_in_kb)); + + start_addr =le32_to_cpu (firmware_usage_v2_1->start_address_in_kb); + size =le16_to_cpu (firmware_usage_v2_1->used_by_firmware_in_kb); + +if ((uint32_t )(start_addr &ATOM_VRAM_OPERATION_FLAGS_MASK ) == + (uint32_t )(ATOM_VRAM_BLOCK_SRIOV_MSG_SHARE_RESERVATION << +ATOM_VRAM_OPERATION_FLAGS_SHIFT )) { +/* Firmware request VRAM reservation for SR-IOV */ + adev->mman.fw_vram_usage_start_offset = (start_addr & + (~ATOM_VRAM_OPERATION_FLAGS_MASK )) <<10 ; + adev->mman.fw_vram_usage_size = size <<10 ; +/* Use the default scratch size */ + usage_bytes =0 ; + }else { + usage_bytes = +le16_to_cpu (firmware_usage_v2_1->used_by_driver_in_kb) <<10 ; + } +return 0 ; +} + +static int amdgpu_atomfirmware_allocate_fb_v2_2 (struct amdgpu_device *adev, +struct vram_usagebyfirmware_v2_2 *firmware_usage_v2_2, +int *usage_bytes) +{ +uint32_t fw_start_addr, fw_size, drv_start_addr, drv_size; + +DRM_DEBUG ("atom requested fw start at %08x %dkb and drv start at %08x %dkb\n" , +le32_to_cpu (firmware_usage_v2_2->fw_region_start_address_in_kb), +le16_to_cpu (firmware_usage_v2_2->used_by_firmware_in_kb), +le32_to_cpu (firmware_usage_v2_2->driver_region0_start_address_in_kb), +le32_to_cpu (firmware_usage_v2_2->used_by_driver_region0_in_kb)); + + fw_start_addr =le32_to_cpu (firmware_usage_v2_2->fw_region_start_address_in_kb); + fw_size =le16_to_cpu (firmware_usage_v2_2->used_by_firmware_in_kb); + + drv_start_addr =le32_to_cpu (firmware_usage_v2_2->driver_region0_start_address_in_kb); + drv_size =le32_to_cpu (firmware_usage_v2_2->used_by_driver_region0_in_kb); + +if ((uint32_t )(fw_start_addr & (ATOM_VRAM_BLOCK_NEEDS_NO_RESERVATION <<30 )) ==0 ) { +/* Firmware request VRAM reservation for SR-IOV */ + adev->mman.fw_vram_usage_start_offset = (fw_start_addr & + (~ATOM_VRAM_OPERATION_FLAGS_MASK )) <<10 ; + adev->mman.fw_vram_usage_size = fw_size <<10 ; + } + +if ((uint32_t )(drv_start_addr & (ATOM_VRAM_BLOCK_NEEDS_NO_RESERVATION <<30 )) ==0 ) { +/* driver request VRAM reservation for SR-IOV */ + adev->mman.drv_vram_usage_start_offset = (drv_start_addr & + (~ATOM_VRAM_OPERATION_FLAGS_MASK )) <<10 ; + adev->mman.drv_vram_usage_size = drv_size <<10 ; + } + + usage_bytes =0 ; +return 0 ; +} +int amdgpu_atomfirmware_allocate_fb_scratch (struct amdgpu_device *adev) {struct atom_context *ctx = adev->mode_info.atom_context;int index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, vram_usagebyfirmware); -struct vram_usagebyfirmware_v2_1 *firmware_usage; -uint32_t start_addr, size; +struct vram_usagebyfirmware_v2_1 *firmware_usage_v2_1; +struct vram_usagebyfirmware_v2_2 *firmware_usage_v2_2;uint16_t data_offset; +uint8_t frev, crev;int usage_bytes =0 ; -if (amdgpu_atom_parse_data_header (ctx, index,NULL ,NULL ,NULL , &data_offset)) { - firmware_usage = (struct vram_usagebyfirmware_v2_1 *)(ctx->bios + data_offset); -DRM_DEBUG ("atom firmware requested %08x %dkb fw %dkb drv\n" , -le32_to_cpu (firmware_usage->start_address_in_kb), -le16_to_cpu (firmware_usage->used_by_firmware_in_kb), -le16_to_cpu (firmware_usage->used_by_driver_in_kb)); - - start_addr =le32_to_cpu (firmware_usage->start_address_in_kb); - size =le16_to_cpu (firmware_usage->used_by_firmware_in_kb); - -if ((uint32_t )(start_addr &ATOM_VRAM_OPERATION_FLAGS_MASK ) == - (uint32_t )(ATOM_VRAM_BLOCK_SRIOV_MSG_SHARE_RESERVATION << -ATOM_VRAM_OPERATION_FLAGS_SHIFT )) { -/* Firmware request VRAM reservation for SR-IOV */ - adev->mman.fw_vram_usage_start_offset = (start_addr & - (~ATOM_VRAM_OPERATION_FLAGS_MASK )) <<10 ; - adev->mman.fw_vram_usage_size = size <<10 ; -/* Use the default scratch size */ - usage_bytes =0 ; - }else { - usage_bytes =le16_to_cpu (firmware_usage->used_by_driver_in_kb) <<10 ; +if (amdgpu_atom_parse_data_header (ctx, index,NULL , &frev, &crev, &data_offset)) { +if (frev ==2 && crev ==1 ) { + firmware_usage_v2_1 = + (struct vram_usagebyfirmware_v2_1 *)(ctx->bios + data_offset); +amdgpu_atomfirmware_allocate_fb_v2_1 (adev, + firmware_usage_v2_1, + &usage_bytes); + }else if (frev >=2 && crev >=2 ) { + firmware_usage_v2_2 = + (struct vram_usagebyfirmware_v2_2 *)(ctx->bios + data_offset); +amdgpu_atomfirmware_allocate_fb_v2_2 (adev, + firmware_usage_v2_2, + &usage_bytes); } } + ctx->scratch_size_bytes =0 ;if (usage_bytes ==0 ) usage_bytes =20 *1024 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +52 -0
76 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +6 -0
@@ -92,6 +92,12 @@ struct amdgpu_mman {struct amdgpu_bo *fw_vram_usage_reserved_bo;void *fw_vram_usage_va; +/* driver VRAM reservation */ +u64 drv_vram_usage_start_offset; +u64 drv_vram_usage_size; +struct amdgpu_bo *drv_vram_usage_reserved_bo; +void *drv_vram_usage_va; +/* PAGE_SIZE'd BO for process memory r/w over SDMA. */ struct amdgpu_bo *sdma_access_bo;void *sdma_access_ptr;
drivers/gpu/drm/amd/include/atomfirmware.h +51 -5
70 lines not on this page · raw message
Signature · 1 line
2.25.1
[AMD Official Use Only - General]
Hi @Koenig, Christian,
Can you help me review the new patch below? Thanks!
Kind regards,
Esther
-----Original Message-----
From: Tong Liu01 <[email protected]>
Sent: 2022年11月4日星期五 下午7:01
To: [email protected]
Cc: Andrey Grodzovsky <[email protected]>; Quan, Evan <[email protected]>; Chen, Horace <[email protected]>; Tuikov, Luben <[email protected]>; Koenig, Christian <[email protected]>; Deucher, Alexander <[email protected]>; Xiao, Jack <[email protected]>; Zhang, Hawking <[email protected]>; Liu, Monk <[email protected]>; Xu, Feifei <[email protected]>; Wang, Yang(Kevin) <[email protected]>; Liu01, Tong (Esther) <[email protected]>
Subject: [PATCH] drm/amdgpu: add vram reservation logic based on vram_usagebyfirmware_v2_2
Move TMR region from top of FB to 2MB for FFBM, so we need to reserve TMR region firstly to make sure TMR can be allocated at 2MB
--- .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 106 ++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 52 +++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 6 + drivers/gpu/drm/amd/include/atomfirmware.h | 56 ++++++++- 4 files changed, 192 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +84 -23
@@ -101,39 +101,99 @@ void amdgpu_atomfirmware_scratch_regs_init(struct amdgpu_device *adev) } } +static int amdgpu_atomfirmware_allocate_fb_v2_1 (struct amdgpu_device *adev, +struct vram_usagebyfirmware_v2_1 *firmware_usage_v2_1, +int *usage_bytes) +{ +uint32_t start_addr, size; + +DRM_DEBUG ("atom firmware v2_1 requested %08x %dkb fw %dkb drv\n" , +le32_to_cpu (firmware_usage_v2_1->start_address_in_kb), +le16_to_cpu (firmware_usage_v2_1->used_by_firmware_in_kb), +le16_to_cpu (firmware_usage_v2_1->used_by_driver_in_kb)); + + start_addr =le32_to_cpu (firmware_usage_v2_1->start_address_in_kb); + size =le16_to_cpu (firmware_usage_v2_1->used_by_firmware_in_kb); + +if ((uint32_t )(start_addr &ATOM_VRAM_OPERATION_FLAGS_MASK ) == + (uint32_t )(ATOM_VRAM_BLOCK_SRIOV_MSG_SHARE_RESERVATION << +ATOM_VRAM_OPERATION_FLAGS_SHIFT )) { +/* Firmware request VRAM reservation for SR-IOV */ + adev->mman.fw_vram_usage_start_offset = (start_addr & + (~ATOM_VRAM_OPERATION_FLAGS_MASK )) <<10 ; + adev->mman.fw_vram_usage_size = size <<10 ; +/* Use the default scratch size */ + usage_bytes =0 ; + }else { + usage_bytes = +le16_to_cpu (firmware_usage_v2_1->used_by_driver_in_kb) <<10 ; + } +return 0 ; +} + +static int amdgpu_atomfirmware_allocate_fb_v2_2 (struct amdgpu_device *adev, +struct vram_usagebyfirmware_v2_2 *firmware_usage_v2_2, +int *usage_bytes) +{ +uint32_t fw_start_addr, fw_size, drv_start_addr, drv_size; + +DRM_DEBUG ("atom requested fw start at %08x %dkb and drv start at %08x %dkb\n" , +le32_to_cpu (firmware_usage_v2_2->fw_region_start_address_in_kb), +le16_to_cpu (firmware_usage_v2_2->used_by_firmware_in_kb), +le32_to_cpu (firmware_usage_v2_2->driver_region0_start_address_in_kb), +le32_to_cpu (firmware_usage_v2_2->used_by_driver_region0_in_kb)); + + fw_start_addr =le32_to_cpu (firmware_usage_v2_2->fw_region_start_address_in_kb); + fw_size =le16_to_cpu (firmware_usage_v2_2->used_by_firmware_in_kb); + + drv_start_addr =le32_to_cpu (firmware_usage_v2_2->driver_region0_start_address_in_kb); + drv_size = +le32_to_cpu (firmware_usage_v2_2->used_by_driver_region0_in_kb); + +if ((uint32_t )(fw_start_addr & (ATOM_VRAM_BLOCK_NEEDS_NO_RESERVATION <<30 )) ==0 ) { +/* Firmware request VRAM reservation for SR-IOV */ + adev->mman.fw_vram_usage_start_offset = (fw_start_addr & + (~ATOM_VRAM_OPERATION_FLAGS_MASK )) <<10 ; + adev->mman.fw_vram_usage_size = fw_size <<10 ; + } + +if ((uint32_t )(drv_start_addr & (ATOM_VRAM_BLOCK_NEEDS_NO_RESERVATION <<30 )) ==0 ) { +/* driver request VRAM reservation for SR-IOV */ + adev->mman.drv_vram_usage_start_offset = (drv_start_addr & + (~ATOM_VRAM_OPERATION_FLAGS_MASK )) <<10 ; + adev->mman.drv_vram_usage_size = drv_size <<10 ; + } + + usage_bytes =0 ; +return 0 ; +} +int amdgpu_atomfirmware_allocate_fb_scratch (struct amdgpu_device *adev) {struct atom_context *ctx = adev->mode_info.atom_context;int index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, vram_usagebyfirmware); -struct vram_usagebyfirmware_v2_1 *firmware_usage; -uint32_t start_addr, size; +struct vram_usagebyfirmware_v2_1 *firmware_usage_v2_1; +struct vram_usagebyfirmware_v2_2 *firmware_usage_v2_2;uint16_t data_offset; +uint8_t frev, crev;int usage_bytes =0 ; -if (amdgpu_atom_parse_data_header (ctx, index,NULL ,NULL ,NULL , &data_offset)) { - firmware_usage = (struct vram_usagebyfirmware_v2_1 *)(ctx->bios + data_offset); -DRM_DEBUG ("atom firmware requested %08x %dkb fw %dkb drv\n" , -le32_to_cpu (firmware_usage->start_address_in_kb), -le16_to_cpu (firmware_usage->used_by_firmware_in_kb), -le16_to_cpu (firmware_usage->used_by_driver_in_kb)); - - start_addr =le32_to_cpu (firmware_usage->start_address_in_kb); - size =le16_to_cpu (firmware_usage->used_by_firmware_in_kb); - -if ((uint32_t )(start_addr &ATOM_VRAM_OPERATION_FLAGS_MASK ) == - (uint32_t )(ATOM_VRAM_BLOCK_SRIOV_MSG_SHARE_RESERVATION << -ATOM_VRAM_OPERATION_FLAGS_SHIFT )) { -/* Firmware request VRAM reservation for SR-IOV */ - adev->mman.fw_vram_usage_start_offset = (start_addr & - (~ATOM_VRAM_OPERATION_FLAGS_MASK )) <<10 ; - adev->mman.fw_vram_usage_size = size <<10 ; -/* Use the default scratch size */ - usage_bytes =0 ; - }else { - usage_bytes =le16_to_cpu (firmware_usage->used_by_driver_in_kb) <<10 ; +if (amdgpu_atom_parse_data_header (ctx, index,NULL , &frev, &crev, &data_offset)) { +if (frev ==2 && crev ==1 ) { + firmware_usage_v2_1 = + (struct vram_usagebyfirmware_v2_1 *)(ctx->bios + data_offset); +amdgpu_atomfirmware_allocate_fb_v2_1 (adev, + firmware_usage_v2_1, + &usage_bytes); + }else if (frev >=2 && crev >=2 ) { + firmware_usage_v2_2 = + (struct vram_usagebyfirmware_v2_2 *)(ctx->bios + data_offset); +amdgpu_atomfirmware_allocate_fb_v2_2 (adev, + firmware_usage_v2_2, + &usage_bytes); } } + ctx->scratch_size_bytes =0 ;if (usage_bytes ==0 ) usage_bytes =20 *1024 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +42 -0
53 lines not on this page · raw message
*/
@@ -1771,6 +1813,15 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
return r;
}
+ /*
+ *The reserved vram for driver must be pinned to the specified
+ *place on the VRAM, so reserve it early.
+ */
+ r = amdgpu_ttm_drv_reserve_vram_init(adev);
+ if (r) {
+ return r;
+ }
+
/*
* only NAVI10 and onwards ASIC support for IP discovery.
* If IP discovery enabled, a block of memory should be @@ -1896,6 +1947,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
amdgpu_bo_free_kernel(&adev->mman.sdma_access_bo, NULL,
&adev->mman.sdma_access_ptr);
amdgpu_ttm_fw_reserve_vram_fini(adev);
+ amdgpu_ttm_drv_reserve_vram_fini(adev);
if (drm_dev_enter(adev_to_drm(adev), &idx)) {
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +6 -0
@@ -92,6 +92,12 @@ struct amdgpu_mman {struct amdgpu_bo *fw_vram_usage_reserved_bo;void *fw_vram_usage_va; +/* driver VRAM reservation */ +u64 drv_vram_usage_start_offset; +u64 drv_vram_usage_size; +struct amdgpu_bo *drv_vram_usage_reserved_bo; +void *drv_vram_usage_va; +/* PAGE_SIZE'd BO for process memory r/w over SDMA. */ struct amdgpu_bo *sdma_access_bo;void *sdma_access_ptr;
drivers/gpu/drm/amd/include/atomfirmware.h +51 -5
69 lines not on this page · raw message
--
2.25.1