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: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
0c321c7962
commit
6b8b1786a8
|
@ -475,11 +475,6 @@ int evergreen_mc_init(struct radeon_device *rdev)
|
||||||
rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
|
rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
|
||||||
rdev->mc.real_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;
|
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);
|
r600_vram_gtt_location(rdev, &rdev->mc);
|
||||||
radeon_update_bandwidth_info(rdev);
|
radeon_update_bandwidth_info(rdev);
|
||||||
|
|
||||||
|
|
|
@ -2001,11 +2001,6 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
|
||||||
else
|
else
|
||||||
rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
|
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)
|
void r100_vga_set_state(struct radeon_device *rdev, bool state)
|
||||||
|
|
|
@ -713,11 +713,6 @@ int r600_mc_init(struct radeon_device *rdev)
|
||||||
rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
|
rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
|
||||||
rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
|
rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
|
||||||
rdev->mc.visible_vram_size = rdev->mc.aper_size;
|
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);
|
r600_vram_gtt_location(rdev, &rdev->mc);
|
||||||
|
|
||||||
if (rdev->flags & RADEON_IS_IGP)
|
if (rdev->flags & RADEON_IS_IGP)
|
||||||
|
|
|
@ -905,11 +905,6 @@ int rv770_mc_init(struct radeon_device *rdev)
|
||||||
rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
|
rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
|
||||||
rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
|
rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
|
||||||
rdev->mc.visible_vram_size = rdev->mc.aper_size;
|
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);
|
r600_vram_gtt_location(rdev, &rdev->mc);
|
||||||
radeon_update_bandwidth_info(rdev);
|
radeon_update_bandwidth_info(rdev);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue