aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r100.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r--drivers/gpu/drm/radeon/r100.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 7712c055b3e8..6112ac99ccd7 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -981,6 +981,7 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)
981 return r; 981 return r;
982 } 982 }
983 rdev->cp.ready = true; 983 rdev->cp.ready = true;
984 rdev->mc.active_vram_size = rdev->mc.real_vram_size;
984 return 0; 985 return 0;
985} 986}
986 987
@@ -998,6 +999,7 @@ void r100_cp_fini(struct radeon_device *rdev)
998void r100_cp_disable(struct radeon_device *rdev) 999void r100_cp_disable(struct radeon_device *rdev)
999{ 1000{
1000 /* Disable ring */ 1001 /* Disable ring */
1002 rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
1001 rdev->cp.ready = false; 1003 rdev->cp.ready = false;
1002 WREG32(RADEON_CP_CSQ_MODE, 0); 1004 WREG32(RADEON_CP_CSQ_MODE, 0);
1003 WREG32(RADEON_CP_CSQ_CNTL, 0); 1005 WREG32(RADEON_CP_CSQ_CNTL, 0);
@@ -2247,6 +2249,7 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
2247 /* FIXME we don't use the second aperture yet when we could use it */ 2249 /* FIXME we don't use the second aperture yet when we could use it */
2248 if (rdev->mc.visible_vram_size > rdev->mc.aper_size) 2250 if (rdev->mc.visible_vram_size > rdev->mc.aper_size)
2249 rdev->mc.visible_vram_size = rdev->mc.aper_size; 2251 rdev->mc.visible_vram_size = rdev->mc.aper_size;
2252 rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
2250 config_aper_size = RREG32(RADEON_CONFIG_APER_SIZE); 2253 config_aper_size = RREG32(RADEON_CONFIG_APER_SIZE);
2251 if (rdev->flags & RADEON_IS_IGP) { 2254 if (rdev->flags & RADEON_IS_IGP) {
2252 uint32_t tom; 2255 uint32_t tom;