Some cleanups before merging into the trunk.multihead-1-0-0-20010730multihead-1-0-0-branch

4 files changed, 3 insertions, 9 deletions

diff --git a/xc/programs/Xserver/GL/dri/dri.c b/xc/programs/Xserver/GL/dri/dri.c
index fffd6a768..12d7a8df1 100644
--- a/xc/programs/Xserver/GL/dri/dri.c
+++ b/xc/programs/Xserver/GL/dri/dri.c
@@ -148,7 +148,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 
     drmWasAvailable = drmAvailable();
 
-tryagain:
     /* Note that drmOpen will try to load the kernel module, if needed. */
     fd = drmOpen(pDRIInfo->drmDriverName, NULL );
     if (fd < 0) {
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
index 4c70b0bf1..3480dc937 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
@@ -1195,9 +1195,6 @@ PrintRegisters(ScrnInfoPtr pScrn, TDFXRegPtr regs)
   ErrorF("Input Status 1 = %x\n", pTDFX->readLong(pTDFX, 0xda));
   ErrorF("2D Status = %x\n", pTDFX->readLong(pTDFX, SST_2D_OFFSET));
   ErrorF("3D Status = %x\n", pTDFX->readLong(pTDFX, SST_3D_OFFSET));
-#if 0
-sleep(10);
-#endif
 #endif
 #endif
 }
@@ -1343,7 +1340,6 @@ DoRestore(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, TDFXRegPtr tdfxReg,
   pTDFX->writeLong(pTDFX, MISCINIT1, tdfxReg->miscinit1);
 #endif
   vgaHWProtect(pScrn, FALSE);
-  sleep(1);
 
   pTDFX->sync(pScrn);
   PrintRegisters(pScrn, tdfxReg);
@@ -1475,7 +1471,7 @@ SetupGfxPLL(int freq) {
 }
 #endif
 
-#if 1
+#if 0
 static Bool
 TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
 {
@@ -1562,7 +1558,6 @@ TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
 
   /* reset */
   pTDFX->writeLong(pTDFX, MISCINIT0, 0xF3);
-  sleep(1);
   pTDFX->writeLong(pTDFX, MISCINIT0, uint[1]);
 
   xfree(bios);
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_drv.h b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_drv.h
index f969ec595..dd46f227e 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_drv.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_drv.h
@@ -109,7 +109,7 @@
 #endif
 
 static drm_device_t	*DRM(device);
-static int              *DRM(minor);
+static int		*DRM(minor);
 static int		DRM(numdevs) = 0;
 
 static struct file_operations	DRM(fops) = {
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
index d27a8fda4..5ed8f1f86 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
@@ -108,7 +108,7 @@ extern unsigned long _bus_base(void);
 #define makedev(x,y)    ((dev_t)(((x) << 8) | (y)))
 #endif
 
-#define DRM_MSG_VERBOSITY 1
+#define DRM_MSG_VERBOSITY 3
 
 static void
 drmMsg(const char *format, ...)