debrix-driver-tdfx/tdfx tdfx_dri.c, 1.4, 1.5 tdfx_dri.h, 1.4, 1.5 tdfx_driver.c, 1.4, 1.5

[Adam Jackson]

Committed by: ajax

Update of /cvs/xserver/debrix-driver-tdfx/tdfx
In directory pdx:/home/ajax/debrix-driver-tdfx/tdfx

Modified Files:
	tdfx_dri.c tdfx_dri.h tdfx_driver.c 
Log Message:
bad ajax, look before you merge.


Index: tdfx_dri.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-tdfx/tdfx/tdfx_dri.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tdfx_dri.c	22 Jun 2004 04:01:27 -0000	1.4
+++ tdfx_dri.c	22 Jun 2004 04:10:02 -0000	1.5
@@ -17,9 +17,9 @@
 static char TDFXClientDriverName[] = "tdfx";
 
 static Bool TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
-			      drmContext hwContext, void *pVisualConfigPriv,
+			      drm_context_t hwContext, void *pVisualConfigPriv,
 			      DRIContextType contextStore);
-static void TDFXDestroyContext(ScreenPtr pScreen, drmContext hwContext,
+static void TDFXDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
 			       DRIContextType contextStore);
 static void TDFXDRISwapContext(ScreenPtr pScreen, DRISyncType syncType,
 			       DRIContextType readContextType,
@@ -329,11 +329,15 @@
 
   pDRIInfo->drmDriverName = TDFXKernelDriverName;
   pDRIInfo->clientDriverName = TDFXClientDriverName;
+  if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
+    pDRIInfo->busIdString = DRICreatePCIBusID(pTDFX->PciInfo);
+  } else {
   pDRIInfo->busIdString = xalloc(64);
   sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
 	  ((pciConfigPtr)pTDFX->PciInfo->thisCard)->busnum,
 	  ((pciConfigPtr)pTDFX->PciInfo->thisCard)->devnum,
 	  ((pciConfigPtr)pTDFX->PciInfo->thisCard)->funcnum);
+  }
   pDRIInfo->ddxDriverMajorVersion = TDFX_MAJOR_VERSION;
   pDRIInfo->ddxDriverMinorVersion = TDFX_MINOR_VERSION;
   pDRIInfo->ddxDriverPatchVersion = TDFX_PATCHLEVEL;
@@ -429,7 +433,7 @@
   }
 
   pTDFXDRI->regsSize=TDFXIOMAPSIZE;
-  if (drmAddMap(pTDFX->drmSubFD, (drmHandle)pTDFX->MMIOAddr[0],
+  if (drmAddMap(pTDFX->drmSubFD, (drm_handle_t)pTDFX->MMIOAddr[0],
 		pTDFXDRI->regsSize, DRM_REGISTERS, 0, &pTDFXDRI->regs)<0) {
     TDFXDRICloseScreen(pScreen);
     xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap failed, disabling DRI.\n");
@@ -470,14 +474,14 @@
 
 static Bool
 TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
-		  drmContext hwContext, void *pVisualConfigPriv,
+		  drm_context_t hwContext, void *pVisualConfigPriv,
 		  DRIContextType contextStore)
 {
   return TRUE;
 }
 
 static void
-TDFXDestroyContext(ScreenPtr pScreen, drmContext hwContext,
+TDFXDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
 		   DRIContextType contextStore)
 {
 }

Index: tdfx_dri.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-tdfx/tdfx/tdfx_dri.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tdfx_dri.h	22 Jun 2004 04:01:27 -0000	1.4
+++ tdfx_dri.h	22 Jun 2004 04:10:02 -0000	1.5
@@ -6,7 +6,7 @@
 #include "xf86drm.h"
 
 typedef struct {
-  drmHandle regs;
+  drm_handle_t regs;
   drmSize regsSize;
   drmAddress regsMap;
   int deviceID;

Index: tdfx_driver.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-tdfx/tdfx/tdfx_driver.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tdfx_driver.c	22 Jun 2004 04:01:27 -0000	1.4
+++ tdfx_driver.c	22 Jun 2004 04:10:02 -0000	1.5
@@ -264,6 +264,7 @@
     "DRIScreenInit",
     "DRIUnlock",
     "GlxSetVisualConfigs",
+    "DRICreatePCIBusID",
     NULL
 };