diff options
| author | Stuart Bennett <stuart@freedesktop.org> | 2009-03-30 20:52:29 +0100 |
|---|---|---|
| committer | Stuart Bennett <stuart@freedesktop.org> | 2009-04-01 00:37:24 +0100 |
| commit | b17bebd811316b5ccca21146b58f8fbf4773f0ad (patch) | |
| tree | ea2b5a08e2af1ea1d4f2edb915fcdcb3f800f89b /src/nv_setup.c | |
| parent | 9c991d3a84ad16f893b739282403eb01e02bb57f (diff) | |
nForce DIMM check is now in DRM
Since it only at most suggests an optimization, there's no real need to
wait for a DRM version bump
Diffstat (limited to 'src/nv_setup.c')
| -rw-r--r-- | src/nv_setup.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c index 1635037..574bc44 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -313,23 +313,6 @@ static void nv4GetConfig (NVPtr pNv) pNv->MaxVClockFreqKHz = 350000; } -static void nForce_check_dimms(ScrnInfoPtr pScrn) -{ - uint16_t mem_ctrlr_pciid = PCI_SLOT_READ_LONG(3, 0x00) >> 16; - - if ((mem_ctrlr_pciid == 0x1a9) || (mem_ctrlr_pciid == 0x1ab) || (mem_ctrlr_pciid == 0x1ed)) { - uint32_t dimm[3]; - - dimm[0] = (PCI_SLOT_READ_LONG(2, 0x40) >> 8) & 0x4f; - dimm[1] = (PCI_SLOT_READ_LONG(2, 0x44) >> 8) & 0x4f; - dimm[2] = (PCI_SLOT_READ_LONG(2, 0x48) >> 8) & 0x4f; - - if (dimm[0] + dimm[1] != dimm[2]) - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Your nForce DIMMs are not arranged in optimal banks!\n"); - } -} - static void nv10GetConfig(ScrnInfoPtr pScrn) { NVPtr pNv = NVPTR(pScrn); @@ -341,13 +324,11 @@ static void nv10GetConfig(ScrnInfoPtr pScrn) "Card is in big endian mode, something is very wrong !\n"); #endif - if (implementation == CHIPSET_NFORCE) { + if (implementation == CHIPSET_NFORCE) pNv->RamAmountKBytes = (((PCI_SLOT_READ_LONG(1, 0x7c) >> 6) & 31) + 1) * 1024; - nForce_check_dimms(pScrn); - } else if (implementation == CHIPSET_NFORCE2) { + else if (implementation == CHIPSET_NFORCE2) pNv->RamAmountKBytes = (((PCI_SLOT_READ_LONG(1, 0x84) >> 4) & 127) + 1) * 1024; - nForce_check_dimms(pScrn); - } else + else pNv->RamAmountKBytes = (nvReadFB(pNv, NV_PFB_CSTATUS) & 0xFFF00000) >> 10; if (pNv->RamAmountKBytes > 256*1024) |