fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-05 15:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

nouveau: nForce 1/2 IGP memory sanity check from DDX

Browse source
This commit is contained in:
Stuart Bennett 2009-03-30 20:38:49 +01:00
parent 2ada855022
commit 93e6527160
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
shared-core/nouveau_mem.c
View file

@ -237,7 +237,7 @@ void nouveau_mem_close(struct drm_device *dev)
* and a small inline to do *val = pci_read_config(pdev->device, where, 4);
* might work
*/
static uint32_t nforce_pci_fn_read_config_dword(int devfn, int where, uint32_t *val)
static int nforce_pci_fn_read_config_dword(int devfn, int where, uint32_t *val)
{
#ifdef __linux__
DRM_PCI_DEV *pdev;
@ -255,6 +255,29 @@ static uint32_t nforce_pci_fn_read_config_dword(int devfn, int where, uint32_t *
#endif
}
static void nouveau_mem_check_nforce_dimms(struct drm_device *dev)
{
uint32_t mem_ctrlr_pciid;
nforce_pci_fn_read_config_dword(3, 0x00, &mem_ctrlr_pciid);
mem_ctrlr_pciid >>= 16;
if (mem_ctrlr_pciid == 0x01a9 || mem_ctrlr_pciid == 0x01ab ||
mem_ctrlr_pciid == 0x01ed) {
uint32_t dimm[3];
int i;
for (i = 0; i < 3; i++) {
nforce_pci_fn_read_config_dword(2, 0x40 + i * 4, &dimm[i]);
dimm[i] = (dimm[i] >> 8) & 0x4f;
}
if (dimm[0] + dimm[1] != dimm[2])
DRM_INFO("Your nForce DIMMs are not arranged in "
"optimal banks!\n");
}
}
static uint32_t
nouveau_mem_fb_amount_igp(struct drm_device *dev)
{
@ -484,6 +507,9 @@ int nouveau_mem_init(struct drm_device *dev)
dev_priv->fb_phys = 0;
dev_priv->gart_info.type = NOUVEAU_GART_NONE;
if (dev_priv->flags & (NV_NFORCE | NV_NFORCE2))
nouveau_mem_check_nforce_dimms(dev);
/* setup a mtrr over the FB */
dev_priv->fb_mtrr = drm_mtrr_add(drm_get_resource_start(dev, 1),
nouveau_mem_fb_amount(dev),