mirror of
https://github.com/torvalds/linux.git
synced 2026-05-12 16:18:45 +02:00
drm/amdgpu: Add firmware extended reserve-region
Use reserve region helpers for initializing/reserving extended firmware reservation area. Signed-off-by: Lijo Lazar <lijo.lazar@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
b2155aaef0
commit
14a517e37a
|
|
@ -1090,11 +1090,11 @@ int psp_update_fw_reservation(struct psp_context *psp)
|
|||
|
||||
reserv_size_ext = roundup(reserv_size_ext, SZ_1M);
|
||||
|
||||
ret = amdgpu_bo_create_kernel_at(adev, reserv_addr_ext, reserv_size_ext,
|
||||
&adev->mman.fw_reserved_memory_extend, NULL);
|
||||
amdgpu_ttm_init_vram_resv(adev, AMDGPU_RESV_FW_EXTEND,
|
||||
reserv_addr_ext, reserv_size_ext, false);
|
||||
ret = amdgpu_ttm_mark_vram_reserved(adev, AMDGPU_RESV_FW_EXTEND);
|
||||
if (ret) {
|
||||
dev_err(adev->dev, "reserve extend fw region failed(%d)!\n", ret);
|
||||
amdgpu_bo_free_kernel(&adev->mman.fw_reserved_memory_extend, NULL, NULL);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2334,8 +2334,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
|
|||
amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_STOLEN_EXTENDED);
|
||||
/* return the FW reserved memory back to VRAM */
|
||||
amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_FW);
|
||||
amdgpu_bo_free_kernel(&adev->mman.fw_reserved_memory_extend, NULL,
|
||||
NULL);
|
||||
amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_FW_EXTEND);
|
||||
amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_STOLEN_RESERVED);
|
||||
}
|
||||
amdgpu_bo_free_kernel(&adev->mman.sdma_access_bo, NULL,
|
||||
|
|
|
|||
|
|
@ -105,9 +105,6 @@ struct amdgpu_mman {
|
|||
|
||||
bool keep_stolen_vga_memory;
|
||||
|
||||
/* fw reserved memory */
|
||||
struct amdgpu_bo *fw_reserved_memory_extend;
|
||||
|
||||
/* firmware VRAM reservation */
|
||||
u64 fw_vram_usage_start_offset;
|
||||
u64 fw_vram_usage_size;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user