diff options
| author | Xavier Bachelot <xavier@bachelot.org> | 2007-10-02 23:05:18 +0000 |
|---|---|---|
| committer | Xavier Bachelot <xavier@bachelot.org> | 2007-10-02 23:05:18 +0000 |
| commit | 3b225162ac518b27c2b5df6305882bcf296206ca (patch) | |
| tree | 1793332a84b3788a949eaf2c815c299c81c16573 | |
| parent | 31ddd99bdba1d7de0382a2c8bf2f4a4b3cb4e444 (diff) | |
better memory detection
| -rw-r--r-- | unichrome/via_driver.c | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/unichrome/via_driver.c b/unichrome/via_driver.c index 8456335..5d3d63c 100644 --- a/unichrome/via_driver.c +++ b/unichrome/via_driver.c @@ -1433,28 +1433,34 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags) } } - /* Detect amount of installed RAM */ - if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) { - if(pVia->Chipset == VIA_CLE266) { - bMemSize = hwp->readSeq(hwp, 0x34); - if (!bMemSize) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "CR34 says nothing; trying CR39.\n"); - bMemSize = hwp->readSeq(hwp, 0x39); - } - } else - bMemSize = hwp->readSeq(hwp, 0x39); - - if (bMemSize > 16 && bMemSize <= 128) - pScrn->videoRam = (bMemSize + 1) << 9; - else if (bMemSize > 0 && bMemSize < 31) - pScrn->videoRam = bMemSize << 12; - else { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Memory size detection failed: using 16MB.\n"); - pScrn->videoRam = 16 << 10; /* Assume the basic 16MB */ - } - } + switch (pVia->Chipset) { + case VIA_CLE266: + case VIA_KM400: + pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ; + break; + case VIA_PM800: + case VIA_VM800: + case VIA_K8M800: + pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ; + break; + case VIA_K8M890: + pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ; + break; + default: + /* Detect amount of installed RAM */ + if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) { + bMemSize = hwp->readSeq(hwp, 0x39); + if (bMemSize > 16 && bMemSize <= 128) + pScrn->videoRam = (bMemSize + 1) << 9; + else if (bMemSize > 0 && bMemSize < 31) + pScrn->videoRam = bMemSize << 12; + else { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Memory size detection failed: using 16MB.\n"); + pScrn->videoRam = 16 << 10; /* Assume the basic 16MB */ + } + } + } /* Split FB for SAMM */ /* FIXME: For now, split FB into two equal sections. This should |