[PATCH 1/3] drm/amdgpu: free the pre-OS console framebuffer after the first modeset

[Christian König]

Am 08.12.20 um 17:05 schrieb Alex Deucher:
> Rather than in late_init to avoid race conditions between freeing the
> buffers and the initial modeset.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com> for patches #1 
and #2, acked-by for #3.

> ---
>   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(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index e49b519aab80..6be131df21f5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -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);
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 255171b8c434..e64b365d07af 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -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