Merge tag 'drm-misc-next-2020-12-17' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gmc.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index c997516fe126c4c8fae34801af207779c84bc91e..fe1a39ffda724f5490791da76dff6c90e8646d57 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -496,13 +496,15 @@ 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_sriov_vf(adev) ||
+           !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))