summaryrefslogtreecommitdiff
path: root/src/via_ums.c
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@infradead.org>2012-06-12 12:35:54 +0100
committerJames Simmons <jsimmons@infradead.org>2012-06-12 12:35:54 +0100
commit75d8b26dcb2d797ecaf09a896d5d68ddc4b87658 (patch)
treecaf501a8dfa3729dfb3fbebe16d36e247a657cad /src/via_ums.c
parentf6fad667b129a59cb12e646294827a573eb7cdb2 (diff)
Remove debug message and some more white space cleanup
Diffstat (limited to 'src/via_ums.c')
-rw-r--r--src/via_ums.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/via_ums.c b/src/via_ums.c
index 7db5f8f..e975cb2 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -701,12 +701,11 @@ UMSPreInit(ScrnInfoPtr pScrn)
switch (pVia->Chipset) {
case VIA_CLE266:
#ifdef XSERVER_LIBPCIACCESS
- pci_device_cfg_read_u8(bridge, &videoRam, 0xE1);
+ pci_device_cfg_read_u8(bridge, &videoRam, 0xE1);
#else
- videoRam = pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70;
+ videoRam = pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70;
#endif
- pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Here 3\n");
+ pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10;
break;
case VIA_KM400:
#ifdef XSERVER_LIBPCIACCESS
@@ -715,11 +714,11 @@ UMSPreInit(ScrnInfoPtr pScrn)
videoRam = pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70;
#endif
pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10;
- /* Workaround for #177 (VRAM probing fail on P4M800) */
- if (pScrn->videoRam < 16384) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Memory size detection failed: using 16 MB.\n");
- pScrn->videoRam = 16 << 10;
+ /* Workaround for #177 (VRAM probing fail on P4M800) */
+ if (pScrn->videoRam < 16384) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "Memory size detection failed: using 16 MB.\n");
+ pScrn->videoRam = 16 << 10;
}
break;
case VIA_PM800: