2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 7427d8cd4c43..868505753a9a 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -370,6 +370,10 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev)
         adev->mc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL;
         adev->mc.visible_vram_size = adev->mc.aper_size;
 
+        /* In case the PCI BAR is larger than the actual amount of vram */
+        if (adev->mc.visible_vram_size > adev->mc.real_vram_size)
+                adev->mc.visible_vram_size = adev->mc.real_vram_size;
+
         /* unless the user had overridden it, set the gart
          * size equal to the 1024 or vram, whichever is larger.
          */
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index cb0e50ebb528..a2d869d30cf4 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -476,6 +476,10 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
         adev->mc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL;
         adev->mc.visible_vram_size = adev->mc.aper_size;
 
+        /* In case the PCI BAR is larger than the actual amount of vram */
+        if (adev->mc.visible_vram_size > adev->mc.real_vram_size)
+                adev->mc.visible_vram_size = adev->mc.real_vram_size;
+
         /* unless the user had overridden it, set the gart
          * size equal to the 1024 or vram, whichever is larger.
          */