Module Name: xsrc
Committed By: macallan
Date: Fri Jul 1 22:31:42 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_driver.c
Log Message:
fix USE_PCIVGAIO usage, allow override from Makefile
now this works again on macppc
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
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.6 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.7
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.6 Thu Jul 23 01:19:16 2015
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c Fri Jul 1 22:31:42 2016
@@ -100,8 +100,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#endif
#define USE_INT10 1
-#define USE_PCIVGAIO (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12)
+/*
+ * XXX
+ * This controls wether VGA IO registers are accessed through the IO BAR or
+ * via legacy registers. No idea why it's made ABI version dependent, on
+ * non-x86 at least I see no reason not to go through the BAR
+ */
+#ifndef USE_PCIVGAIO
+#define USE_PCIVGAIO (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12)
+#endif
/* Required Functions: */
static const OptionInfoRec * TDFXAvailableOptions(int chipid, int busid);
@@ -2244,11 +2252,12 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
if (!pTDFX->usePIO) TDFXSetMMIOAccess(pTDFX);
-#ifndef USE_PCIVGAIO
+#if USE_PCIVGAIO
+ vgaHWGetIOBase(hwp);
+#else
/* access VGA registers through the IO BAR, not legacy decoding */
hwp->PIOOffset = pTDFX->PIOBase[0] - 0x300;
#endif
- vgaHWGetIOBase(hwp);
/* Map VGA memory only for primary cards (to save/restore textmode data). */
if (pTDFX->Primary) {
if (!vgaHWMapMem(pScrn))
