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

Commit 974b16e3 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms/r600: clamp vram to aperture size 



r6xx and r7xx was missing this.  We don't support
non-CPU accessible vram yet.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 8ef8678c

drivers/gpu/drm/radeon/r600.c

+7 −0
Original line number Diff line number Diff line
@@ -380,6 +380,13 @@ int r600_mc_init(struct radeon_device *rdev) 
	/* Setup GPU memory space */

	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);

	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);



	if (rdev->mc.mc_vram_size > rdev->mc.aper_size)

		rdev->mc.mc_vram_size = rdev->mc.aper_size;



	if (rdev->mc.real_vram_size > rdev->mc.aper_size)

		rdev->mc.real_vram_size = rdev->mc.aper_size;



	if (rdev->flags & RADEON_IS_AGP) {

		r = radeon_agp_init(rdev);

		if (r)

drivers/gpu/drm/radeon/rv770.c

+7 −0
Original line number Diff line number Diff line
@@ -801,6 +801,13 @@ int rv770_mc_init(struct radeon_device *rdev) 
	/* Setup GPU memory space */

	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);

	rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);



	if (rdev->mc.mc_vram_size > rdev->mc.aper_size)

		rdev->mc.mc_vram_size = rdev->mc.aper_size;



	if (rdev->mc.real_vram_size > rdev->mc.aper_size)

		rdev->mc.real_vram_size = rdev->mc.aper_size;



	if (rdev->flags & RADEON_IS_AGP) {

		r = radeon_agp_init(rdev);

		if (r)