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

Commit 6b8b1786 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: enable use of unmappable VRAM V2 



This patch enable the use of unmappable VRAM thanks to
previous TTM infrastructure change.

V2 update after io_mem_reserve/io_mem_free callback balancing

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0c321c79

drivers/gpu/drm/radeon/evergreen.c

+0 −5
Original line number Diff line number Diff line
@@ -475,11 +475,6 @@ int evergreen_mc_init(struct radeon_device *rdev) 
	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;

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

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

	/* FIXME remove this once we support unmappable VRAM */

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

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

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

	}

	r600_vram_gtt_location(rdev, &rdev->mc);

	radeon_update_bandwidth_info(rdev);

drivers/gpu/drm/radeon/r100.c

+0 −5
Original line number Diff line number Diff line
@@ -2001,11 +2001,6 @@ void r100_vram_init_sizes(struct radeon_device *rdev) 
		else

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

	}

	/* FIXME remove this once we support unmappable VRAM */

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

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

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

	}

}



void r100_vga_set_state(struct radeon_device *rdev, bool state)

drivers/gpu/drm/radeon/r600.c

+0 −5
Original line number Diff line number Diff line
@@ -713,11 +713,6 @@ int r600_mc_init(struct radeon_device *rdev) 
	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);

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

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

	/* FIXME remove this once we support unmappable VRAM */

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

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

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

	}

	r600_vram_gtt_location(rdev, &rdev->mc);



	if (rdev->flags & RADEON_IS_IGP)

drivers/gpu/drm/radeon/rv770.c

+0 −5
Original line number Diff line number Diff line
@@ -905,11 +905,6 @@ int rv770_mc_init(struct radeon_device *rdev) 
	rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);

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

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

	/* FIXME remove this once we support unmappable VRAM */

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

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

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

	}

	r600_vram_gtt_location(rdev, &rdev->mc);

	radeon_update_bandwidth_info(rdev);