1 files changed, 23 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 5617cf62c566..79f9ac29019b 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -819,12 +819,33 @@ static int gmc_v6_0_late_init(void *handle)
 {
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+        amdgpu_bo_late_init(adev);
+
         if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
                 return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
         else
                 return 0;
 }
 
+static unsigned gmc_v6_0_get_vbios_fb_size(struct amdgpu_device *adev)
+{
+        u32 d1vga_control = RREG32(mmD1VGA_CONTROL);
+        unsigned size;
+
+        if (REG_GET_FIELD(d1vga_control, D1VGA_CONTROL, D1VGA_MODE_ENABLE)) {
+                size = 9 * 1024 * 1024; /* reserve 8MB for vga emulator and 1 MB for FB */
+        } else {
+                u32 viewport = RREG32(mmVIEWPORT_SIZE);
+                size = (REG_GET_FIELD(viewport, VIEWPORT_SIZE, VIEWPORT_HEIGHT) *
+                        REG_GET_FIELD(viewport, VIEWPORT_SIZE, VIEWPORT_WIDTH) *
+                        4);
+        }
+        /* return 0 if the pre-OS buffer uses up most of vram */
+        if ((adev->gmc.real_vram_size - size) < (8 * 1024 * 1024))
+                return 0;
+        return size;
+}
+
 static int gmc_v6_0_sw_init(void *handle)
 {
         int r;
@@ -851,8 +872,6 @@ static int gmc_v6_0_sw_init(void *handle)
 
         adev->gmc.mc_mask = 0xffffffffffULL;
 
-        adev->gmc.stolen_size = 256 * 1024;
-
         adev->need_dma32 = false;
         dma_bits = adev->need_dma32 ? 32 : 40;
         r = pci_set_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits));
@@ -878,6 +897,8 @@ static int gmc_v6_0_sw_init(void *handle)
         if (r)
                 return r;
 
+        adev->gmc.stolen_size = gmc_v6_0_get_vbios_fb_size(adev);
+
         r = amdgpu_bo_init(adev);
         if (r)
                 return r;