rpms/xorg-x11-drv-tdfx/devel tdfx-1.3.0-update.patch, NONE, 1.1 xorg-x11-drv-tdfx.spec, 1.21, 1.22 tdfx-1.3.0-fix-ddc-order.patch, 1.1, NONE

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Wed Feb 27 01:03:57 UTC 2008 

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-tdfx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12860

Modified Files:
	xorg-x11-drv-tdfx.spec 
Added Files:
	tdfx-1.3.0-update.patch 
Removed Files:
	tdfx-1.3.0-fix-ddc-order.patch 
Log Message:
* Wed Feb 27 2008 Dave Airlie <airlied at fedoraproject.org> - 1.3.0-8
- make tdfx build again by rebasing to upstream - may not work


tdfx-1.3.0-update.patch:

--- NEW FILE tdfx-1.3.0-update.patch ---
diff --git a/configure.ac b/configure.ac
index 2bdc5a0..9069993 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,12 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+	      [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+	      [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -95,6 +101,12 @@ if test "$DRI" = yes; then
         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
 fi
 
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
 AC_SUBST([DRI_CFLAGS])
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
diff --git a/src/tdfx.h b/src/tdfx.h
index 6820056..5f09401 100644
--- a/src/tdfx.h
+++ b/src/tdfx.h
@@ -15,6 +15,7 @@
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
+#include "xf86DDC.h"
 #include "xf86xv.h"
 #include "tdfxdefs.h"
 
@@ -31,9 +32,43 @@
 #define TDFX_VERSION 4000
 #define TDFX_NAME "TDFX"
 #define TDFX_DRIVER_NAME "tdfx"
-#define TDFX_MAJOR_VERSION 1
-#define TDFX_MINOR_VERSION 3
-#define TDFX_PATCHLEVEL 0
+#define TDFX_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define TDFX_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define TDFX_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
+
+/* Macros to aid source compatibilty between pci-rework and "classic" builds.
+ */
+#ifdef XSERVER_LIBPCIACCESS
+#include <pciaccess.h>
+
+#define DEVICE_ID(p) (p)->device_id
+
+#define PCI_READ_LONG(value, offset, card_index) \
+    pci_device_cfg_read_u32(pTDFX->PciInfo[(card_index)], & (value), (offset))
+
+#define PCI_WRITE_LONG(value, offset, card_index) \
+    pci_device_cfg_write_u32(pTDFX->PciInfo[(card_index)], (value), (offset))
+
+#define PCI_IO_BASE(p, region) \
+    (p)->regions[region].base_addr
+
+#define PCI_MEM_BASE(p, region) \
+    (p)->regions[region].base_addr
+#else
+#define DEVICE_ID(p) (p)->chipType
+
+#define PCI_READ_LONG(value, offset, card_index) \
+    (value) = pciReadLong(pTDFX->PciTag[(card_index)], (offset))
+
+#define PCI_WRITE_LONG(value, offset, card_index) \
+    pciWriteLong(pTDFX->PciTag[(card_index)], (offset), (value))
+
+#define PCI_IO_BASE(p, region) \
+    (p)->ioBase[region]
+
+#define PCI_MEM_BASE(p, region) \
+    (p)->memBase[region]
+#endif
 
 struct _TDFXRec;
 typedef struct _TDFXRec *TDFXPtr;
@@ -136,10 +171,27 @@ typedef struct TextureData_t {
 
 #define MAXCHIPS 4
 
+#ifdef XSERVER_LIBPCIACCESS
+enum tdfx_chips {
+    Banshee = 0,
+    Voodoo3_2000,
+    Voodoo3_3000,
+    Voodoo3_Unknown,
+    Voodoo5,
+    MAX_VOODOO_CARDS
+};
+#endif
+
 typedef struct _TDFXRec {
+#ifdef XSERVER_LIBPCIACCESS
+    enum tdfx_chips match_id;
+    void *MMIOBase[MAXCHIPS];
+    void *FbBase;
+#else
   unsigned char *MMIOBase[MAXCHIPS];
   unsigned char *FbBase;
   unsigned char *myFbBase;
+#endif
   IOADDRESS PIOBase[MAXCHIPS];
   long FbMapSize;
   int pixelFormat;
@@ -148,12 +200,18 @@ typedef struct _TDFXRec {
   int maxClip;
   int MaxClock;
   int ChipType;
+#ifdef XSERVER_LIBPCIACCESS
+    struct pci_device *PciInfo[MAXCHIPS];
+#else
   pciVideoPtr PciInfo;
+#endif
   unsigned long LinearAddr[MAXCHIPS];
   unsigned long MMIOAddr[MAXCHIPS];
   EntityInfoPtr pEnt;
   int numChips;
+#ifndef XSERVER_PCIACCESS
   PCITAG PciTag[MAXCHIPS];
+#endif
   Bool Primary;
   int HasSGRAM;
   int PciCnt;
@@ -233,6 +291,8 @@ typedef struct _TDFXRec {
   ScreenWakeupHandlerProcPtr coreWakeupHandler;
   ScreenBlockHandlerProcPtr coreBlockHandler;
 
+  I2CBusPtr pI2CBus;
+
 } TDFXRec;
 
 typedef struct {
diff --git a/src/tdfx_dri.c b/src/tdfx_dri.c
index 765c716..9548c00 100644
--- a/src/tdfx_dri.c
+++ b/src/tdfx_dri.c
@@ -345,6 +345,9 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
 
   pDRIInfo->drmDriverName = TDFXKernelDriverName;
   pDRIInfo->clientDriverName = TDFXClientDriverName;
+#ifdef XSERVER_LIBPCIACCESS
+    pDRIInfo->busIdString = DRICreatePCIBusID(pTDFX->PciInfo[0]);
+#else
   if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
     pDRIInfo->busIdString = DRICreatePCIBusID(pTDFX->PciInfo);
   } else {
@@ -354,6 +357,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
 	    ((pciConfigPtr)pTDFX->PciInfo->thisCard)->devnum,
 	    ((pciConfigPtr)pTDFX->PciInfo->thisCard)->funcnum);
   }
+#endif
   pDRIInfo->ddxDriverMajorVersion = TDFX_MAJOR_VERSION;
   pDRIInfo->ddxDriverMinorVersion = TDFX_MINOR_VERSION;
   pDRIInfo->ddxDriverPatchVersion = TDFX_PATCHLEVEL;
@@ -514,7 +518,11 @@ TDFXDRIFinishScreenInit(ScreenPtr pScreen)
   pTDFX->pDRIInfo->driverSwapMethod = DRI_HIDE_X_CONTEXT;
 
   pTDFXDRI=(TDFXDRIPtr)pTDFX->pDRIInfo->devPrivate;
-  pTDFXDRI->deviceID=pTDFX->PciInfo->chipType;
+#ifdef XSERVER_LIBPCIACCESS
+  pTDFXDRI->deviceID = DEVICE_ID(pTDFX->PciInfo[0]);
+#else
+  pTDFXDRI->deviceID = DEVICE_ID(pTDFX->PciInfo);
+#endif
   pTDFXDRI->width=pScrn->virtualX;
   pTDFXDRI->height=pScrn->virtualY;
   pTDFXDRI->mem=pScrn->videoRam*1024;
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index b9be362..1b51124 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -2,6 +2,10 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 #define USE_INT10 1
 #define USE_PCIVGAIO 1
 
@@ -108,7 +112,12 @@ static const OptionInfoRec *	TDFXAvailableOptions(int chipid, int busid);
 static void TDFXIdentify(int flags);
 
 /* Identify if there is any hardware present that I know how to drive. */
[...1664 lines suppressed...]
-		     ((((i+1)>>2)<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
-		     ((0x0<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
-		     ((0xff<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
-		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
-		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+	  PCI_WRITE_LONG(CFG_ENHANCED_VIDEO_EN |
+			 CFG_ENHANCED_VIDEO_SLV |
+			 CFG_DAC_HSYNC_TRISTATE |
+			 CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+			 (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+			  CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+			 CFG_DIVIDE_VIDEO_BY_1,
+			 CFG_VIDEO_CTRL0, i);
+	  PCI_WRITE_LONG(((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+			 ((((i+1)>>2)<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+			 ((0x0<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+			 ((0xff<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT),
+			 CFG_VIDEO_CTRL1, i);
+	  PCI_WRITE_LONG((0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+			 (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT),
+			 CFG_VIDEO_CTRL2, i);
       } else {
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
-		     CFG_ENHANCED_VIDEO_EN |
-		     CFG_ENHANCED_VIDEO_SLV |
-		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
-		     (CFG_VIDEO_OTHERMUX_SEL_PIPE_PLUS_AAFIFO <<
-		      CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
-		     CFG_DIVIDE_VIDEO_BY_4);
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
-		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
-		     ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
-		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
-		     ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
-		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
-		     (0xff << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+	  PCI_WRITE_LONG(CFG_ENHANCED_VIDEO_EN |
+			 CFG_ENHANCED_VIDEO_SLV |
+			 CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+			 (CFG_VIDEO_OTHERMUX_SEL_PIPE_PLUS_AAFIFO <<
+			  CFG_VIDEO_OTHERMUX_SEL_FALSE_SHIFT) |
+			 CFG_DIVIDE_VIDEO_BY_4,
+			 CFG_VIDEO_CTRL0, i);
+	  PCI_WRITE_LONG(((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+			 ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+			 ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+			 ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT),
+			 CFG_VIDEO_CTRL1, i);
+	  PCI_WRITE_LONG((0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+			 (0xff << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT),
+			 CFG_VIDEO_CTRL2, i);
       }
     } else if (pTDFX->numChips==4 && sliEnable && aaSamples==4 && sliAnalog) {
       /* 4 chips 4 AA 2 analog SLI */
       if (!i) {
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
-		     CFG_ENHANCED_VIDEO_EN |
-		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
-		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
-		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
-		     CFG_DIVIDE_VIDEO_BY_4);
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
-		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
-		     ((0x0<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
-		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
-		     ((0x0<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
-		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
-		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+	  PCI_WRITE_LONG(CFG_ENHANCED_VIDEO_EN |
+			 CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+			 (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+			  CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+			 CFG_DIVIDE_VIDEO_BY_4,
+			 CFG_VIDEO_CTRL0, i);
+	  PCI_WRITE_LONG(((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+			 ((0x0<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+			 ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+			 ((0x0<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT),
+			 CFG_VIDEO_CTRL1, i);
+	  PCI_WRITE_LONG((0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+			 (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT),
+			 CFG_VIDEO_CTRL2, i);
       } else if (i==1 || i==3) {
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
-		     CFG_ENHANCED_VIDEO_EN |
-		     CFG_ENHANCED_VIDEO_SLV |
-		     CFG_DAC_HSYNC_TRISTATE |
-		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
-		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
-		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
-		     CFG_DIVIDE_VIDEO_BY_4);
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
-		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
-		     ((((i+1)>>2)<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
-		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
-		     ((((i+1)>>2)<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
-		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
-		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+	  PCI_WRITE_LONG(CFG_ENHANCED_VIDEO_EN |
+			 CFG_ENHANCED_VIDEO_SLV |
+			 CFG_DAC_HSYNC_TRISTATE |
+			 CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+			 (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+			  CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+			 CFG_DIVIDE_VIDEO_BY_4,
+			 CFG_VIDEO_CTRL0, i);
+	  PCI_WRITE_LONG(((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+			 ((((i+1)>>2)<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+			 ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+			 ((((i+1)>>2)<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT),
+			 CFG_VIDEO_CTRL1, i);
+	  PCI_WRITE_LONG((0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+			 (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT),
+			 CFG_VIDEO_CTRL2, i);
       } else {
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
-		     CFG_ENHANCED_VIDEO_EN |
-		     CFG_ENHANCED_VIDEO_SLV |
-		     CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
-		     (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
-		      CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
-		     CFG_DIVIDE_VIDEO_BY_4);
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL1,
-		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
-		     ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
-		     ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
-		     ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT));
-	pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL2,
-		     (0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
-		     (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT));
+	  PCI_WRITE_LONG(CFG_ENHANCED_VIDEO_EN |
+			 CFG_ENHANCED_VIDEO_SLV |
+			 CFG_VIDEO_LOCALMUX_DESKTOP_PLUS_OVERLAY |
+			 (CFG_VIDEO_OTHERMUX_SEL_PIPE <<
+			  CFG_VIDEO_OTHERMUX_SEL_TRUE_SHIFT) |
+			 CFG_DIVIDE_VIDEO_BY_4,
+			 CFG_VIDEO_CTRL0, i);
+	  PCI_WRITE_LONG(((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_FETCH_SHIFT) |
+			 ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_FETCH_SHIFT) |
+			 ((0x1<<sliLinesLog2) << CFG_SLI_RENDERMASK_CRT_SHIFT) |
+			 ((0x1<<sliLinesLog2) << CFG_SLI_COMPAREMASK_CRT_SHIFT),
+			 CFG_VIDEO_CTRL1, i);
+	  PCI_WRITE_LONG((0x0 << CFG_SLI_RENDERMASK_AAFIFO_SHIFT) |
+			 (0x0 << CFG_SLI_COMPAREMASK_AAFIFO_SHIFT),
+			 CFG_VIDEO_CTRL2, i);
       }
     }
     if (pTDFX->numChips==4 && sliEnable && aaSamples==4 && i==3) {
-      v=pciReadLong(pTDFX->PciTag[i], CFG_SLI_AA_MISC);
-      pciWriteLong(pTDFX->PciTag[i], CFG_SLI_AA_MISC, 
-		   v | CFG_AA_LFB_RD_SLV_WAIT);
+	PCI_READ_LONG(v, CFG_SLI_AA_MISC, i);
+	PCI_WRITE_LONG(v | CFG_AA_LFB_RD_SLV_WAIT, CFG_SLI_AA_MISC, i);
     }
     if (i) {
-      v=pciReadLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0);
-      pciWriteLong(pTDFX->PciTag[i], CFG_VIDEO_CTRL0,
-		   v|CFG_VIDPLL_SEL);
+	PCI_READ_LONG(v, CFG_VIDEO_CTRL0, i);
+	PCI_WRITE_LONG(v | CFG_VIDPLL_SEL, CFG_VIDEO_CTRL0, i);
       v=pTDFX->readChipLong(pTDFX, i, MISCINIT1);
       pTDFX->writeChipLong(pTDFX, i, MISCINIT1, v|SST_POWERDOWN_DAC);
     }
diff --git a/src/tdfxdefs.h b/src/tdfxdefs.h
index b9c01ce..c661d64 100644
--- a/src/tdfxdefs.h
+++ b/src/tdfxdefs.h
@@ -110,6 +110,28 @@
 #define VIDINFORMAT 0x70
 #define VIDINSTATUS 0x74
 #define VIDSERIALPARALLELPORT 0x78
+#define VSP_TVOUT_RESET	0x80000000	/* 0 forces TVout reset */
+#define VSP_GPIO2_IN	0x40000000
+#define VSP_GPIO1_OUT	0x20000000
+#define VSP_VMI_RESET_N	0x10000000	/* 0 forces a VMI reset */
+#define VSP_SDA1_IN	0x08000000	/* i2c bus on the feature connector */
+#define VSP_SCL1_IN	0x04000000
+#define VSP_SDA1_OUT	0x02000000
+#define VSP_SCL1_OUT	0x01000000
+#define VSP_ENABLE_IIC1	0x00800000	/* 1 enables I2C bus 1 */
+#define VSP_SDA0_IN	0x00400000	/* i2c bus on the monitor connector */
+#define VSP_SCL0_IN	0x00200000
+#define VSP_SDA0_OUT	0x00100000
+#define VSP_SCL0_OUT	0x00080000
+#define VSP_ENABLE_IIC0	0x00040000	/* 1 enables I2C bus 0 */
+#define VSP_VMI_ADDRESS	0x0003c000	/* mask */
+#define VSP_VMI_DATA	0x00003fc0	/* mask */
+#define VSP_VMI_DISABLE	0x00000020	/* 0 enables VMI output */
+#define VSP_VMI_RDY_N	0x00000010
+#define VSP_RW_N	0x00000008
+#define VSP_DS_N	0x00000004
+#define VSP_CS_N	0x00000002
+#define VSP_HOST_ENABLE	0x00000001	/* 1 enables VMI host control*/
 #define VIDINXDECIMDELTAS 0x7c
 #define VIDINDECIMINITERRS 0x80
 #define VIDYDECIMDELTA 0x84


Index: xorg-x11-drv-tdfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-tdfx/devel/xorg-x11-drv-tdfx.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-tdfx.spec	20 Feb 2008 07:49:02 -0000	1.21
+++ xorg-x11-drv-tdfx.spec	27 Feb 2008 01:03:20 -0000	1.22
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 tdfx video driver
 Name:      xorg-x11-drv-tdfx
 Version:   1.3.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -14,24 +14,28 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   tdfx.xinf
 
-Patch0: tdfx-1.3.0-fix-ddc-order.patch
+Patch0: tdfx-1.3.0-update.patch
 
 ExcludeArch: s390 s390x
 
-BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+BuildRequires: xorg-x11-server-sdk 
+#>= 1.4.99.1
 BuildRequires: libdrm-devel >= 2.0-1
+BuildRequires: automake autoconf libtool pkgconfig
+BuildRequires: xorg-x11-util-macros >= 1.1.5
 
 Requires:  hwdata
-Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
+Requires:  xorg-x11-server-Xorg >= 1.4.99.1
 
 %description 
 X.Org X11 tdfx video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .ddc
+%patch0 -p1 -b .update
 
 %build
+aclocal ; autoheader; automake -a ; autoconf
 %configure --disable-static
 make
 
@@ -57,6 +61,9 @@
 %{_mandir}/man4/tdfx.4*
 
 %changelog
+* Wed Feb 27 2008 Dave Airlie <airlied at fedoraproject.org> - 1.3.0-8
+- make tdfx build again by rebasing to upstream - may not work
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.0-7
 - Autorebuild for GCC 4.3
 


--- tdfx-1.3.0-fix-ddc-order.patch DELETED ---

More information about the fedora-extras-commits mailing list