drm/amdgpu: fix regression in vbios reservation handling on headless
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix regression in vbios reservation handling on headless
We need to move the check under the non-headless case, otherwise we always reserve the VGA save size.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +5 -4
@@ -496,13 +496,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 ))
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Tuesday, December 15, 2020 12:04 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH] drm/amdgpu: fix regression in vbios reservation handling on headless
We need to move the check under the non-headless case, otherwise we always reserve the VGA save size.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +5 -4
@@ -496,13 +496,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.25.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cguchun.chen%40amd.com%7C6e2ac830fdaa4d6cb9a008d8a049d71e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637435586296954490%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=1hJTxX95ydbW92ukjgJHvc9L3kC2%2FWCDJKBpAVnbpuc%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx