drm/amdgpu: free the pre-OS console framebuffer after the first modeset
Subsystems (3)
PATCH 1/3 drm/amdgpu: free the pre-OS console framebuffer after the first modeset
Rather than in late_init to avoid race conditions between freeing the buffers and the initial modeset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++------ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++++ 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -6
@@ -2026,10 +2026,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)*/ void amdgpu_ttm_late_init (struct amdgpu_device *adev) { -/* return the VGA stolen memory (if any) back to VRAM */ -if (!adev->mman.keep_stolen_vga_memory) -amdgpu_bo_free_kernel (&adev->mman.stolen_vga_memory,NULL ,NULL ); -amdgpu_bo_free_kernel (&adev->mman.stolen_extended_memory,NULL ,NULL ); }/*
@@ -2042,8 +2038,8 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)amdgpu_ttm_training_reserve_vram_fini (adev);/* return the stolen vga memory back to VRAM */ -if (adev->mman.keep_stolen_vga_memory) -amdgpu_bo_free_kernel (&adev->mman.stolen_vga_memory,NULL ,NULL ); +amdgpu_bo_free_kernel (&adev->mman.stolen_vga_memory,NULL ,NULL ); +amdgpu_bo_free_kernel (&adev->mman.stolen_extended_memory,NULL ,NULL );/* return the IP Discovery TMR memory back to VRAM */ amdgpu_bo_free_kernel (&adev->mman.discovery_memory,NULL ,NULL );amdgpu_ttm_fw_reserve_vram_fini (adev);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -0
@@ -8440,6 +8440,11 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)drm_atomic_helper_cleanup_planes (dev, state); +/* return the stolen vga memory back to VRAM */ +if (!adev->mman.keep_stolen_vga_memory) +amdgpu_bo_free_kernel (&adev->mman.stolen_vga_memory,NULL ,NULL ); +amdgpu_bo_free_kernel (&adev->mman.stolen_extended_memory,NULL ,NULL ); +/* * Finally, drop a runtime PM reference for each newly disabled CRTC, * so we can put the GPU into runtime suspend if we're not driving any
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amdgpu: remove amdgpu_ttm_late_init and amdgpu_bo_late_init
No longer used.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 17 ----------------- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 7 ------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 - drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 -- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 -- 9 files changed, 36 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0 -17
@@ -1074,23 +1074,6 @@ int amdgpu_bo_init(struct amdgpu_device *adev)return amdgpu_ttm_init (adev); } -/** -* amdgpu_bo_late_init - late init -* @adev: amdgpu device object -* -* Calls amdgpu_ttm_late_init() to free resources used earlier during -* initialization. -* -* Returns: -* 0 for success or a negative error code on failure. -*/ -int amdgpu_bo_late_init (struct amdgpu_device *adev) -{ -amdgpu_ttm_late_init (adev); - -return 0 ; -} -/** * amdgpu_bo_fini - tear down memory manager * @adev: amdgpu device object
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +0 -1
@@ -269,7 +269,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,void amdgpu_bo_unpin (struct amdgpu_bo *bo);int amdgpu_bo_evict_vram (struct amdgpu_device *adev);int amdgpu_bo_init (struct amdgpu_device *adev); -int amdgpu_bo_late_init (struct amdgpu_device *adev);void amdgpu_bo_fini (struct amdgpu_device *adev);int amdgpu_bo_fbdev_mmap (struct amdgpu_bo *bo,struct vm_area_struct *vma);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0 -7
@@ -2021,13 +2021,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)return 0 ; } -/* -* amdgpu_ttm_late_init - Handle any late initialization for amdgpu_ttm -*/ -void amdgpu_ttm_late_init (struct amdgpu_device *adev) -{ -} -/* * amdgpu_ttm_fini - De-initialize the TTM memory pools */
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -1
@@ -131,7 +131,6 @@ int amdgpu_vram_mgr_query_page_status(struct ttm_resource_manager *man, uint64_t start);int amdgpu_ttm_init (struct amdgpu_device *adev); -void amdgpu_ttm_late_init (struct amdgpu_device *adev);void amdgpu_ttm_fini (struct amdgpu_device *adev);void amdgpu_ttm_set_buffer_funcs_status (struct amdgpu_device *adev,bool enable);
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +0 -2
@@ -717,8 +717,6 @@ static int gmc_v10_0_late_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int r; -amdgpu_bo_late_init (adev); - r =amdgpu_gmc_allocate_vm_inv_eng (adev);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +0 -2
@@ -791,8 +791,6 @@ static int gmc_v6_0_late_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -amdgpu_bo_late_init (adev); -if (amdgpu_vm_fault_stop !=AMDGPU_VM_FAULT_STOP_ALWAYS )return amdgpu_irq_get (adev, &adev->gmc.vm_fault,0 );else
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0 -2
@@ -961,8 +961,6 @@ static int gmc_v7_0_late_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -amdgpu_bo_late_init (adev); -if (amdgpu_vm_fault_stop !=AMDGPU_VM_FAULT_STOP_ALWAYS )return amdgpu_irq_get (adev, &adev->gmc.vm_fault,0 );else
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0 -2
@@ -1062,8 +1062,6 @@ static int gmc_v8_0_late_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -amdgpu_bo_late_init (adev); -if (amdgpu_vm_fault_stop !=AMDGPU_VM_FAULT_STOP_ALWAYS )return amdgpu_irq_get (adev, &adev->gmc.vm_fault,0 );else
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0 -2
@@ -1177,8 +1177,6 @@ static int gmc_v9_0_late_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int r; -amdgpu_bo_late_init (adev); - r =amdgpu_gmc_allocate_vm_inv_eng (adev);if (r)return r;
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu: fix size calculation with stolen vga memory
In reply to Alex DeucherIf we need to keep the stolen vga memory, make sure it is at least as big as the legacy vga size.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +3 -0
@@ -501,6 +501,9 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev)else size =amdgpu_gmc_get_vbios_fb_size (adev); +if (adev->mman.keep_stolen_vga_memory) + size =max (size,AMDGPU_VBIOS_VGA_ALLOCATION ); +/* set to 0 if the pre-OS buffer uses up most of vram */ if ((adev->gmc.real_vram_size - size) < (8 *1024 *1024 )) size =0 ;
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 08.12.20 um 17:05 schrieb Alex Deucher:
Quoted 4 lines
Rather than in
late_initto avoid race conditions between freeing the buffers and the initial modeset.Signed-off-by Alex Deucher <[email protected]>
Quoted 37 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++------ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++++ 2 files changed, 7 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2
-6@@ -2026,10 +2026,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)*/ void amdgpu_ttm_late_init (struct amdgpu_device *adev) { -/* return the VGA stolen memory (if any) back to VRAM */ -if (!adev->mman.keep_stolen_vga_memory) -amdgpu_bo_free_kernel (&adev->mman.stolen_vga_memory,NULL ,NULL ); -amdgpu_bo_free_kernel (&adev->mman.stolen_extended_memory,NULL ,NULL ); }/* @@ -2042,8 +2038,8 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)amdgpu_ttm_training_reserve_vram_fini (adev);/* return the stolen vga memory back to VRAM */ -if (adev->mman.keep_stolen_vga_memory) -amdgpu_bo_free_kernel (&adev->mman.stolen_vga_memory,NULL ,NULL ); +amdgpu_bo_free_kernel (&adev->mman.stolen_vga_memory,NULL ,NULL ); +amdgpu_bo_free_kernel (&adev->mman.stolen_extended_memory,NULL ,NULL );/* return the IP Discovery TMR memory back to VRAM */ amdgpu_bo_free_kernel (&adev->mman.discovery_memory,NULL ,NULL );amdgpu_ttm_fw_reserve_vram_fini (adev);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0@@ -8440,6 +8440,11 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) · line 8450
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5
-0drm_atomic_helper_cleanup_planes (dev, state); +/* return the stolen vga memory back to VRAM */ +if (!adev->mman.keep_stolen_vga_memory) +amdgpu_bo_free_kernel (&adev->mman.stolen_vga_memory,NULL ,NULL ); +amdgpu_bo_free_kernel (&adev->mman.stolen_extended_memory,NULL ,NULL ); +/* * Finally, drop a runtime PM reference for each newly disabled CRTC, * so we can put the GPU into runtime suspend if we're not driving any
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx