| From c0cb2dc1e1dde54775d5b84f3b34ce5654b44ca3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 14 Dec 2020 11:00:47 -0500 |
| Subject: drm/amdgpu: fix regression in vbios reservation handling on headless |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| [ Upstream commit 7eded018bfeccb365963bb51be731a9f99aeea59 ] |
| |
| We need to move the check under the non-headless case, otherwise |
| we always reserve the VGA save size. |
| |
| Fixes: 157fe68d74c2ad ("drm/amdgpu: fix size calculation with stolen vga memory") |
| Reviewed-by: Guchun Chen <guchun.chen@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c |
| index 3e4892b7b7d3c..ff4e226739308 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c |
| @@ -494,13 +494,14 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev) |
| break; |
| } |
| |
| - if (!amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_DCE)) |
| + if (!amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_DCE)) { |
| size = 0; |
| - else |
| + } else { |
| size = amdgpu_gmc_get_vbios_fb_size(adev); |
| |
| - if (adev->mman.keep_stolen_vga_memory) |
| - size = max(size, (unsigned)AMDGPU_VBIOS_VGA_ALLOCATION); |
| + if (adev->mman.keep_stolen_vga_memory) |
| + size = max(size, (unsigned)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)) |
| -- |
| 2.27.0 |
| |
