From 25ece682b561cc0c243d0c7aa09ebbc08489bbf3 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Mon, 31 Jan 2022 05:04:24 +0000 Subject: revert fb size workaround from amdgpu_gmc.c rev 1.3 djm@ confirms the recently committed 5.5.18 change 'drm/amdgpu: Use correct VIEWPORT_DIMENSION for DCN2' to use the right register for GMC9 DCN2 (RENOIR, GREEN_SARDINE) is enough on t14 gen 2 amd. --- sys/dev/pci/drm/amd/amdgpu/amdgpu_gmc.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'sys/dev/pci') diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_gmc.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_gmc.c index a8e4e89edd1..82706b5abe2 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_gmc.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_gmc.c @@ -704,15 +704,6 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev) } else { size = amdgpu_gmc_get_vbios_fb_size(adev); -#ifdef __amd64__ - /* - * XXX Workaround for machines where the framebuffer - * size reported by the hardware is incorrect. - */ - extern psize_t efifb_stolen(); - size = max(size, efifb_stolen()); -#endif - if (adev->mman.keep_stolen_vga_memory) size = max(size, (unsigned)AMDGPU_VBIOS_VGA_ALLOCATION); } -- cgit v1.2.3