diff options
| author | Stuart Bennett <stuart@freedesktop.org> | 2009-03-30 20:38:49 +0100 |
|---|---|---|
| committer | Stuart Bennett <stuart@freedesktop.org> | 2009-03-30 20:48:08 +0100 |
| commit | 93e65271601e6a1c7c90453f2f13157ae24b35c2 (patch) | |
| tree | 3c87e1fadd7ef23bf7193c37f715922c0f88c490 | |
| parent | 2ada85502242a3d5328b8f392d7843ef58a78780 (diff) | |
nouveau: nForce 1/2 IGP memory sanity check from DDX
| -rw-r--r-- | shared-core/nouveau_mem.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c index af23214e6..627b91781 100644 --- a/shared-core/nouveau_mem.c +++ b/shared-core/nouveau_mem.c @@ -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), |