summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-08-15 09:56:42 +1000
committerDave Airlie <airlied@redhat.com>2008-08-15 09:56:42 +1000
commit2030db75328b7d896a5dd030fc171020b33149e1 (patch)
treea072d7d3c895e3e5c6e7270db21a1c9f2db34b3b
parente0bbd04eb0e2395872983e243d242f5ba2f2306f (diff)
radeon: reserve 64k of VRAM for now for text mode so we don't trample it
need to revisit this later I'm sure
-rw-r--r--linux-core/radeon_gem.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/linux-core/radeon_gem.c b/linux-core/radeon_gem.c
index bf8fb2e9..6a7529cd 100644
--- a/linux-core/radeon_gem.c
+++ b/linux-core/radeon_gem.c
@@ -704,14 +704,18 @@ int radeon_gem_mm_init(struct drm_device *dev)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
int ret;
+ u32 pg_offset;
/* size the mappable VRAM memory for now */
radeon_vram_setup(dev);
radeon_init_memory_map(dev);
- drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, 0, /*dev_priv->mm.vram_offset >> PAGE_SHIFT,*/
- (dev_priv->mm.vram_visible) >> PAGE_SHIFT,
+#define VRAM_RESERVE_TEXT (64*1024)
+ dev_priv->mm.vram_visible -= VRAM_RESERVE_TEXT;
+ pg_offset = VRAM_RESERVE_TEXT >> PAGE_SHIFT;
+ drm_bo_init_mm(dev, DRM_BO_MEM_VRAM, pg_offset, /*dev_priv->mm.vram_offset >> PAGE_SHIFT,*/
+ ((dev_priv->mm.vram_visible) >> PAGE_SHIFT) - 16,
0);