Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1493cd5 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: limit visible vram if it's smaller than the BAR 



In some cases the amount of vram may be less than the BAR size,
if so, limit visible vram to the amount of actual vram, not the
BAR size.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b70f014d

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -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.real_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL;

	adev->mc.visible_vram_size = adev->mc.aper_size;

	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

	/* unless the user had overridden it, set the gart

	 * size equal to the 1024 or vram, whichever is larger.

	 * size equal to the 1024 or vram, whichever is larger.

	 */

	 */

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -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.real_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL;

	adev->mc.visible_vram_size = adev->mc.aper_size;

	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

	/* unless the user had overridden it, set the gart

	 * size equal to the 1024 or vram, whichever is larger.

	 * size equal to the 1024 or vram, whichever is larger.

	 */

	 */