CVS commit: xsrc/external/mit/xf86-video-tdfx/dist/src
Module Name:xsrc
Committed By: macallan
Date: Fri Aug 19 21:12:46 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_dri.c tdfx_driver.c
Log Message:
adapt to new Xserver
untested
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c
cvs rdiff -u -r1.7 -r1.8 \
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_dri.c
diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.4 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.5
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.4 Thu Jul 23 01:19:16 2015
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c Fri Aug 19 21:12:46 2016
@@ -3,6 +3,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
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.7 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.8
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.7 Fri Jul 1 22:31:42 2016
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c Fri Aug 19 21:12:46 2016
@@ -49,6 +49,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
/*
* These are X and server generic header files.
*/
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
@@ -2256,7 +2257,8 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
vgaHWGetIOBase(hwp);
#else
/* access VGA registers through the IO BAR, not legacy decoding */
- hwp->PIOOffset = pTDFX->PIOBase[0] - 0x300;
+/* XXX */
+/* hwp->PIOOffset = pTDFX->PIOBase[0] - 0x300;*/
#endif
/* Map VGA memory only for primary cards (to save/restore textmode data). */
if (pTDFX->Primary) {
CVS commit: xsrc/external/mit/xf86-video-tdfx/dist/src
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))
CVS commit: xsrc/external/mit/xf86-video-tdfx/dist/src
Module Name:xsrc
Committed By: wiz
Date: Mon Feb 23 11:18:02 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_driver.c
Log Message:
Reduce diff to upstream (whitespace only).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
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.3 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.3 Mon Jun 3 10:02:22 2013
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c Mon Feb 23 11:18:02 2015
@@ -669,15 +669,15 @@ TDFXInitChips(ScrnInfoPtr pScrn)
} else {
for (i = 0; i pTDFX-numChips; i++) {
PCI_WRITE_LONG(initbits | BIT(10), CFG_INIT_ENABLE, i);
-
- #if 0
- v=pciReadWord(pTDFX-PciTag[i], CFG_PCI_COMMAND);
- if (!i)
- pciWriteWord(pTDFX-PciTag[i], CFG_PCI_COMMAND, v | 0x3);
- else
- pciWriteWord(pTDFX-PciTag[i], CFG_PCI_COMMAND, v | 0x2);
- #endif
-
+
+#if 0
+ v=pciReadWord(pTDFX-PciTag[i], CFG_PCI_COMMAND);
+ if (!i)
+ pciWriteWord(pTDFX-PciTag[i], CFG_PCI_COMMAND, v | 0x3);
+ else
+ pciWriteWord(pTDFX-PciTag[i], CFG_PCI_COMMAND, v | 0x2);
+#endif
+
pTDFX-MMIOAddr[i] = mem0base + (i * mem0size);
PCI_WRITE_LONG(pTDFX-MMIOAddr[i], CFG_MEM0BASE, i);
CVS commit: xsrc/external/mit/xf86-video-tdfx/dist/src
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 0xff00;
pTDFX-LinearAddr[0] = mem1base 0xff00;
+ 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] = 0xFF00;
@@ -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] = 0xFF00;
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
CVS commit: xsrc/external/mit/xf86-video-tdfx/dist/src
Module Name:xsrc
Committed By: macallan
Date: Sun Jan 22 18:26:42 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_driver.c
Log Message:
don't mess with BARs if only one card is present
now this works again on macppc
While there, move USE_INT10 and USE_PCIVGAIO to the reachover Makefile.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
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.1.1.4 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.2
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.1.1.4 Sat Aug 22 00:10:18 2009
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c Sun Jan 22 18:26:42 2012
@@ -6,9 +6,6 @@
#include inttypes.h
#endif
-#define USE_INT10 1
-#define USE_PCIVGAIO 1
-
/**
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -658,23 +655,28 @@ TDFXInitChips(ScrnInfoPtr pScrn)
xf86DrvMsgVerb(pScrn-scrnIndex, X_INFO, 3,
TDFXInitChips: cfgbits = 0x%08lx\n, cfgbits);
-for (i = 0; i pTDFX-numChips; i++) {
+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 0xff00;
+ pTDFX-LinearAddr[0] = mem1base 0xff00;
+} else {
+ for (i = 0; i pTDFX-numChips; i++) {
PCI_WRITE_LONG(initbits | BIT(10), CFG_INIT_ENABLE, i);
-
-#if 0
- v=pciReadWord(pTDFX-PciTag[i], CFG_PCI_COMMAND);
- if (!i)
- pciWriteWord(pTDFX-PciTag[i], CFG_PCI_COMMAND, v | 0x3);
- else
- pciWriteWord(pTDFX-PciTag[i], CFG_PCI_COMMAND, v | 0x2);
-#endif
-
+
+ #if 0
+ v=pciReadWord(pTDFX-PciTag[i], CFG_PCI_COMMAND);
+ if (!i)
+ pciWriteWord(pTDFX-PciTag[i], CFG_PCI_COMMAND, v | 0x3);
+ else
+ pciWriteWord(pTDFX-PciTag[i], CFG_PCI_COMMAND, v | 0x2);
+ #endif
+
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] = 0xFF00;
@@ -682,14 +684,18 @@ 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] = 0xFF00;
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
@@ -2214,7 +2220,8 @@ TDFXScreenInit(int scrnIndex, ScreenPtr
if (!pTDFX-usePIO) TDFXSetMMIOAccess(pTDFX);
-#if USE_PCIVGAIO
+#ifndef USE_PCIVGAIO
+ /* access VGA registers through the IO BAR, not legacy decoding */
hwp-PIOOffset = pTDFX-PIOBase[0] - 0x300;
#endif
vgaHWGetIOBase(hwp);
CVS commit: xsrc/external/mit/xf86-video-tdfx/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Aug 27 04:21:06 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_dri.c Log Message: add a (pointer) cast. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.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_dri.c diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.1.1.2 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.2 --- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.1.1.2 Wed Jun 10 00:48:46 2009 +++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c Thu Aug 27 04:21:06 2009 @@ -360,7 +360,7 @@ pDRIInfo-ddxDriverMajorVersion = TDFX_MAJOR_VERSION; pDRIInfo-ddxDriverMinorVersion = TDFX_MINOR_VERSION; pDRIInfo-ddxDriverPatchVersion = TDFX_PATCHLEVEL; - pDRIInfo-frameBufferPhysicalAddress = pTDFX-LinearAddr[0]; + pDRIInfo-frameBufferPhysicalAddress = (pointer) pTDFX-LinearAddr[0]; pDRIInfo-frameBufferSize = pTDFX-FbMapSize; pDRIInfo-frameBufferStride = pTDFX-stride; pDRIInfo-ddxDrawableTableEntry = TDFX_MAX_DRAWABLES;
