Module Name: xsrc
Committed By: wiz
Date: Mon Feb 23 11:28:46 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_driver.c
Log Message:
Make local patch smaller.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c
diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.4 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.5
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.4 Mon Feb 23 11:18:02 2015
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c Mon Feb 23 11:28:46 2015
@@ -660,12 +660,16 @@ TDFXInitChips(ScrnInfoPtr pScrn)
if (pTDFX->numChips == 1) {
/*
- * XXX
* Do not fudge BARs with only one chip present.
- * Now this works again on NetBSD/macppc.
*/
pTDFX->MMIOAddr[0] = mem0base & 0xffffff00;
pTDFX->LinearAddr[0] = mem1base & 0xffffff00;
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+ "TDFXInitChips: MMIOAddr[%d] = 0x%08lx\n",
+ 0, pTDFX->MMIOAddr[0]);
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+ "TDFXInitChips: LinearAddr[%d] = 0x%08lx\n",
+ 0, pTDFX->LinearAddr[0]);
} else {
for (i = 0; i < pTDFX->numChips; i++) {
PCI_WRITE_LONG(initbits | BIT(10), CFG_INIT_ENABLE, i);
@@ -680,6 +684,10 @@ TDFXInitChips(ScrnInfoPtr pScrn)
pTDFX->MMIOAddr[i] = mem0base + (i * mem0size);
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+ "TDFXInitChips: MMIOAddr[%d] = 0x%08lx\n",
+ i, pTDFX->MMIOAddr[i]);
+
PCI_WRITE_LONG(pTDFX->MMIOAddr[i], CFG_MEM0BASE, i);
pTDFX->MMIOAddr[i] &= 0xFFFFFF00;
@@ -687,18 +695,15 @@ TDFXInitChips(ScrnInfoPtr pScrn)
PCI_WRITE_LONG(pTDFX->LinearAddr[i], CFG_MEM1BASE, i);
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+ "TDFXInitChips: LinearAddr[%d] = 0x%08lx\n",
+ i, pTDFX->LinearAddr[i]);
pTDFX->LinearAddr[i] &= 0xFFFFFF00;
PCI_WRITE_LONG(cfgbits, CFG_PCI_DECODE, i);
PCI_WRITE_LONG(initbits, CFG_INIT_ENABLE, i);
}
}
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: MMIOAddr[%d] = 0x%08lx\n",
- 0, pTDFX->MMIOAddr[0]);
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: LinearAddr[%d] = 0x%08lx\n",
- 0, pTDFX->LinearAddr[0]);
}
void
