leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: drop the CPU pointers for the stolen vga bos

Browse Source 
We never use them.

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2020-07-28 18:34:50 -04:00
parent 7348c20a4e
commit 14b18937cb
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
View File

@ -1915,7 +1915,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
uint64_t gtt_size;
int r;
u64 vis_vram_limit;
void *stolen_vga_buf, *stolen_extended_buf;
mutex_init(&adev->mman.gtt_window_lock);
@ -1982,14 +1981,14 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
r = amdgpu_bo_create_kernel_at(adev, 0, adev->gmc.stolen_vga_size,
AMDGPU_GEM_DOMAIN_VRAM,
&adev->gmc.stolen_vga_memory,
&stolen_vga_buf);
NULL);
if (r)
return r;
r = amdgpu_bo_create_kernel_at(adev, adev->gmc.stolen_vga_size,
adev->gmc.stolen_extended_size,
AMDGPU_GEM_DOMAIN_VRAM,
&adev->gmc.stolen_extended_memory,
&stolen_extended_buf);
NULL);
if (r)
return r;
@ -2048,13 +2047,10 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
*/
void amdgpu_ttm_late_init(struct amdgpu_device *adev)
{
void *stolen_vga_buf, *stolen_extended_buf;
/* return the VGA stolen memory (if any) back to VRAM */
if (!adev->gmc.keep_stolen_vga_memory)
amdgpu_bo_free_kernel(&adev->gmc.stolen_vga_memory, NULL, &stolen_vga_buf);
amdgpu_bo_free_kernel(&adev->gmc.stolen_extended_memory, NULL,
&stolen_extended_buf);
amdgpu_bo_free_kernel(&adev->gmc.stolen_vga_memory, NULL, NULL);
amdgpu_bo_free_kernel(&adev->gmc.stolen_extended_memory, NULL, NULL);
}
/**
@ -2062,15 +2058,13 @@ void amdgpu_ttm_late_init(struct amdgpu_device *adev)
*/
void amdgpu_ttm_fini(struct amdgpu_device *adev)
{
void *stolen_vga_buf;
if (!adev->mman.initialized)
return;
amdgpu_ttm_training_reserve_vram_fini(adev);
/* return the stolen vga memory back to VRAM */
if (adev->gmc.keep_stolen_vga_memory)
amdgpu_bo_free_kernel(&adev->gmc.stolen_vga_memory, NULL, &stolen_vga_buf);
amdgpu_bo_free_kernel(&adev->gmc.stolen_vga_memory, NULL, NULL);
/* return the IP Discovery TMR memory back to VRAM */
amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
amdgpu_ttm_fw_reserve_vram_fini(adev);