drm/amdgpu: free the pre-OS console framebuffer after the first modeset (5f6fab24) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -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_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);

+5 −0

Original line number	Diff line number	Diff line
		@@ -8462,6 +8462,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