tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Lijo Lazar and committed by
Alex Deucher 14a517e3 b2155aae

+4 -8
+3 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
··· 1090 1090 1091 1091 reserv_size_ext = roundup(reserv_size_ext, SZ_1M); 1092 1092 1093 - ret = amdgpu_bo_create_kernel_at(adev, reserv_addr_ext, reserv_size_ext, 1094 - &adev->mman.fw_reserved_memory_extend, NULL); 1093 + amdgpu_ttm_init_vram_resv(adev, AMDGPU_RESV_FW_EXTEND, 1094 + reserv_addr_ext, reserv_size_ext, false); 1095 + ret = amdgpu_ttm_mark_vram_reserved(adev, AMDGPU_RESV_FW_EXTEND); 1095 1096 if (ret) { 1096 1097 dev_err(adev->dev, "reserve extend fw region failed(%d)!\n", ret); 1097 - amdgpu_bo_free_kernel(&adev->mman.fw_reserved_memory_extend, NULL, NULL); 1098 1098 return ret; 1099 1099 } 1100 1100
+1 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
··· 2334 2334 amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_STOLEN_EXTENDED); 2335 2335 /* return the FW reserved memory back to VRAM */ 2336 2336 amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_FW); 2337 - amdgpu_bo_free_kernel(&adev->mman.fw_reserved_memory_extend, NULL, 2338 - NULL); 2337 + amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_FW_EXTEND); 2339 2338 amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_STOLEN_RESERVED); 2340 2339 } 2341 2340 amdgpu_bo_free_kernel(&adev->mman.sdma_access_bo, NULL,
-3
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
··· 105 105 106 106 bool keep_stolen_vga_memory; 107 107 108 - /* fw reserved memory */ 109 - struct amdgpu_bo *fw_reserved_memory_extend; 110 - 111 108 /* firmware VRAM reservation */ 112 109 u64 fw_vram_usage_start_offset; 113 110 u64 fw_vram_usage_size;