drm/nouveau: make portion of vram as reserved for PRAMIN on all chipsets

NV04 was completely busted.  Push buffers were getting allocated at the
end of VRAM, overwriting PRAMIN.  So, it turns out PRAMIN is in VRAM on
all chips.  Question answered!
This commit is contained in:
Ben Skeggs 2009-03-06 09:04:44 +10:00
parent 6e68f1f2b0
commit 96e09e22a6
2 changed files with 2 additions and 6 deletions

View file

@ -649,10 +649,7 @@ int nouveau_mem_init(struct drm_device *dev)
/* Init FB */
dev_priv->fb_phys=drm_get_resource_start(dev,1);
fb_size = nouveau_mem_fb_amount(dev);
/* On at least NV40, RAMIN is actually at the end of vram.
* We don't want to allocate this... */
if (dev_priv->card_type >= NV_40)
fb_size -= dev_priv->ramin_rsvd_vram;
fb_size -= dev_priv->ramin_rsvd_vram;
dev_priv->fb_available_size = fb_size;
DRM_DEBUG("Available VRAM: %dKiB\n", fb_size>>10);

View file

@ -27,8 +27,7 @@ nv04_instmem_determine_amount(struct drm_device *dev)
break;
}
} else {
/*XXX: what *are* the limits on <NV40 cards?, and does RAMIN
* exist in vram on those cards as well?
/*XXX: what *are* the limits on <NV40 cards?
*/
dev_priv->ramin_rsvd_vram = (512*1024);
}