summaryrefslogtreecommitdiff
path: root/shared-core/nouveau_mem.c
diff options
context:
space:
mode:
authorNian Wu <nian.wu@intel.com>2007-03-01 09:02:09 -0500
committerNian Wu <nian@tinderbox.sh.intel.com>2007-03-01 09:02:09 -0500
commit6c48b8e7ffd0af4d49855d7175e822f4af1f526f (patch)
tree4ec7cf10147f3a17e6d4eeec8e48faa90880b8d9 /shared-core/nouveau_mem.c
parent0bbbb46650667c84a50f1a675a7a910d6ef7df4b (diff)
parent72caa48c82e4334d3292185dbadf758d2dd14c16 (diff)
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'shared-core/nouveau_mem.c')
-rw-r--r--shared-core/nouveau_mem.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c
index 3b1f443c..f62d8615 100644
--- a/shared-core/nouveau_mem.c
+++ b/shared-core/nouveau_mem.c
@@ -335,7 +335,8 @@ int nouveau_mem_init(struct drm_device *dev)
if (init_heap(&dev_priv->agp_heap, info.aperture_base, info.aperture_size))
goto no_agp;
- dev_priv->agp_phys=info.aperture_base;
+ dev_priv->agp_phys = info.aperture_base;
+ dev_priv->agp_available_size = info.aperture_size;
}
no_agp:
@@ -346,6 +347,7 @@ no_agp:
* We don't want to allocate this... */
if (dev_priv->card_type >= NV_40)
fb_size -= dev_priv->ramin_size;
+ dev_priv->fb_available_size = fb_size;
DRM_DEBUG("Available VRAM: %dKiB\n", fb_size>>10);
if (fb_size>256*1024*1024) {