Merge the multihead-1-0-0 branch into the trunk, with the exception of the

    glide header files.
The changes include:
- Brian Paul's changes to the tdfx client-side 3D driver to make it
    dlopen() the correct glide library (Voodoo3 or Voodoo5). This allows
    both types of the glide library to co-exist, and allows Voodoo3/Voodoo5
    cards to be mixed in multi-head configs.
- DRM kernel driver changes to allow a driver to set up multiple instances
    (minor numbers), one for each card present that the driver supports.
    This is currently implemented and tested only for the tdfx DRM driver.
- Add some missing missing <stdarg.h> includes.
- Some log message cleanups.
- Change the 2D tdfx driver to access VGA legacy registers via their PCI
    I/O space access points rather than their legacy addresses, and fix
    some problems with the way the VGA-related bits are initialised.
Status:
- With these changes, multi-head direct rendering works with multiple
    Voodoo3 and/or Voodoo5 cards. This has been tested with two PCI Voodoo3
    cards and an AGP Voodoo5 card, and all permutations of those.
Caveats:
- Xinerama is not supported. If Xinerama is enabled, then direct rendering
    gets disabled.
- The text mode on secondary screens will show junk after the X server
    exits.
- On some hardware, starting the X server on multiple 3dfx cards will
    result in a hard lockup. One workaround is to enable APIC support in a
    uni-processor kernel, or use an SMP kernel.

4 files changed, 156 insertions, 59 deletions

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index c5f231c7..dd46f227 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -101,9 +101,16 @@
 #define DRIVER_IOCTLS
 #endif
 
+/*
+ * The default number of instances (minor numbers) to initialize.
+ */
+#ifndef DRIVER_NUM_CARDS
+#define DRIVER_NUM_CARDS 1
+#endif
 
-static drm_device_t	DRM(device);
-static int              DRM(minor);
+static drm_device_t	*DRM(device);
+static int		*DRM(minor);
+static int		DRM(numdevs) = 0;
 
 static struct file_operations	DRM(fops) = {
 #if LINUX_VERSION_CODE >= 0x020400
@@ -460,46 +467,102 @@ static int DRM(takedown)( drm_device_t *dev )
 	return 0;
 }
 
+/*
+ * Figure out how many instances to initialize.
+ */
+static int drm_count_cards(void)
+{
+	int num = 0;
+#if defined(DRIVER_CARD_LIST)
+	u_int *l;
+	u_int device, vendor;
+	struct pci_dev *pdev = NULL;
+#endif
+
+	DRM_DEBUG( "\n" );
+
+#if defined(DRIVER_COUNT_CARDS)
+	num = DRIVER_COUNT_CARDS();
+#elif defined(DRIVER_CARD_LIST)
+	for (l = DRIVER_CARD_LIST; *l; l++) {
+		pdev = NULL;
+		device = *l & 0xFFFF;
+		if (device == 0xFFFF)
+			device = PCI_ANY_ID;
+		vendor = (*l >> 16) & 0xFFFF;
+		if (vendor == 0xFFFF)
+			vendor = PCI_ANY_ID;
+		while ((pdev = pci_find_device(vendor, device, pdev))) {
+			num++;
+		}
+	}
+#else
+	num = DRIVER_NUM_CARDS;
+#endif
+	DRM_DEBUG("numdevs = %d\n", num);
+	return num;
+}
+
 /* drm_init is called via init_module at module load time, or via
  * linux/init/main.c (this is not currently supported).
  */
 static int __init drm_init( void )
 {
-	drm_device_t *dev = &DRM(device);
+
+	drm_device_t *dev;
+	int i;
 #if __HAVE_CTX_BITMAP
 	int retcode;
 #endif
 	DRM_DEBUG( "\n" );
 
-	memset( (void *)dev, 0, sizeof(*dev) );
-	dev->count_lock = SPIN_LOCK_UNLOCKED;
-	sema_init( &dev->struct_sem, 1 );
-
 #ifdef MODULE
 	DRM(parse_options)( drm_opts );
 #endif
+
+	DRM(numdevs) = drm_count_cards();
+	/* Force at least one instance. */
+	if (DRM(numdevs) <= 0)
+		DRM(numdevs) = 1;
+
+	DRM(device) = kmalloc(sizeof(*DRM(device)) * DRM(numdevs), GFP_KERNEL);
+	if (!DRM(device)) {
+		return -ENOMEM;
+	}
+	DRM(minor) = kmalloc(sizeof(*DRM(minor)) * DRM(numdevs), GFP_KERNEL);
+	if (!DRM(minor)) {
+		kfree(DRM(device));
+		return -ENOMEM;
+	}
+
 	DRIVER_PREINIT();
 
 	DRM(mem_init)();
 
-	if ((DRM(minor) = DRM(stub_register)(DRIVER_NAME, &DRM(fops),dev)) < 0)
-		return -EPERM;
-	dev->device = MKDEV(DRM_MAJOR, DRM(minor) );
-	dev->name   = DRIVER_NAME;
+	for (i = 0; i < DRM(numdevs); i++) {
+		dev = &(DRM(device)[i]);
+		memset( (void *)dev, 0, sizeof(*dev) );
+		dev->count_lock = SPIN_LOCK_UNLOCKED;
+		sema_init( &dev->struct_sem, 1 );
+
+		if ((DRM(minor)[i] = DRM(stub_register)(DRIVER_NAME, &DRM(fops),dev)) < 0)
+			return -EPERM;
+		dev->device = MKDEV(DRM_MAJOR, DRM(minor)[i] );
+		dev->name   = DRIVER_NAME;
 
 #if __REALLY_HAVE_AGP
-	dev->agp = DRM(agp_init)();
+		dev->agp = DRM(agp_init)();
 #if __MUST_HAVE_AGP
-	if ( dev->agp == NULL ) {
-		DRM_ERROR( "Cannot initialize the agpgart module.\n" );
-		DRM(stub_unregister)(DRM(minor));
-		DRM(takedown)( dev );
-		return -ENOMEM;
-	}
+		if ( dev->agp == NULL ) {
+			DRM_ERROR( "Cannot initialize the agpgart module.\n" );
+			DRM(stub_unregister)(DRM(minor)[i]);
+			DRM(takedown)( dev );
+			return -ENOMEM;
+		}
 #endif
 #if __REALLY_HAVE_MTRR
-	if (dev->agp)
-		dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base,
+		if (dev->agp)
+			dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base,
 				       dev->agp->agp_info.aper_size*1024*1024,
 				       MTRR_TYPE_WRCOMB,
 				       1 );
@@ -507,25 +570,25 @@ static int __init drm_init( void )
 #endif
 
 #if __HAVE_CTX_BITMAP
-	retcode = DRM(ctxbitmap_init)( dev );
-	if( retcode ) {
-		DRM_ERROR( "Cannot allocate memory for context bitmap.\n" );
-		DRM(stub_unregister)(DRM(minor));
-		DRM(takedown)( dev );
-		return retcode;
-	}
+		retcode = DRM(ctxbitmap_init)( dev );
+		if( retcode ) {
+			DRM_ERROR( "Cannot allocate memory for context bitmap.\n" );
+			DRM(stub_unregister)(DRM(minor)[i]);
+			DRM(takedown)( dev );
+			return retcode;
+		}
 #endif
+		DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d\n",
+		  	DRIVER_NAME,
+		  	DRIVER_MAJOR,
+		  	DRIVER_MINOR,
+		  	DRIVER_PATCHLEVEL,
+		  	DRIVER_DATE,
+		  	DRM(minor)[i] );
+	}
 
 	DRIVER_POSTINIT();
 
-	DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d\n",
-		  DRIVER_NAME,
-		  DRIVER_MAJOR,
-		  DRIVER_MINOR,
-		  DRIVER_PATCHLEVEL,
-		  DRIVER_DATE,
-		  DRM(minor) );
-
 	return 0;
 }
 
@@ -533,38 +596,48 @@ static int __init drm_init( void )
  */
 static void __exit drm_cleanup( void )
 {
-	drm_device_t *dev = &DRM(device);
+	drm_device_t *dev;
+	int i;
 
 	DRM_DEBUG( "\n" );
 
-	if ( DRM(stub_unregister)(DRM(minor)) ) {
-		DRM_ERROR( "Cannot unload module\n" );
-	} else {
-		DRM_INFO( "Module unloaded\n" );
-	}
+	for (i = DRM(numdevs) - 1; i >= 0; i--) {
+		dev = &(DRM(device)[i]);
+		if ( DRM(stub_unregister)(DRM(minor)[i]) ) {
+			DRM_ERROR( "Cannot unload module\n" );
+		} else {
+			DRM_DEBUG("minor %d unregistered\n", DRM(minor)[i]);
+			if (i == 0) {
+				DRM_INFO( "Module unloaded\n" );
+			}
+		}
 #if __HAVE_CTX_BITMAP
-	DRM(ctxbitmap_cleanup)( dev );
+		DRM(ctxbitmap_cleanup)( dev );
 #endif
 
 #if __REALLY_HAVE_AGP && __REALLY_HAVE_MTRR
-	if ( dev->agp && dev->agp->agp_mtrr ) {
-		int retval;
-		retval = mtrr_del( dev->agp->agp_mtrr,
+		if ( dev->agp && dev->agp->agp_mtrr ) {
+			int retval;
+			retval = mtrr_del( dev->agp->agp_mtrr,
 				   dev->agp->agp_info.aper_base,
 				   dev->agp->agp_info.aper_size*1024*1024 );
-		DRM_DEBUG( "mtrr_del=%d\n", retval );
-	}
+			DRM_DEBUG( "mtrr_del=%d\n", retval );
+		}
 #endif
 
-	DRM(takedown)( dev );
+		DRM(takedown)( dev );
 
 #if __REALLY_HAVE_AGP
-	if ( dev->agp ) {
-		DRM(agp_uninit)();
-		DRM(free)( dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS );
-		dev->agp = NULL;
-	}
+		if ( dev->agp ) {
+			DRM(agp_uninit)();
+			DRM(free)( dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS );
+			dev->agp = NULL;
+		}
 #endif
+	}
+	kfree(DRM(minor));
+	kfree(DRM(device));
+	DRM(numdevs) = 0;
 }
 
 module_init( drm_init );
@@ -608,8 +681,19 @@ int DRM(version)( struct inode *inode, struct file *filp,
 
 int DRM(open)( struct inode *inode, struct file *filp )
 {
-	drm_device_t *dev = &DRM(device);
+	drm_device_t *dev = NULL;
 	int retcode = 0;
+	int i;
+
+	for (i = 0; i < DRM(numdevs); i++) {
+		if (MINOR(inode->i_rdev) == DRM(minor)[i]) {
+			dev = &(DRM(device)[i]);
+			break;
+		}
+	}
+	if (!dev) {
+		return -ENODEV;
+	}
 
 	DRM_DEBUG( "open_count = %d\n", dev->open_count );
 
diff --git a/linux-core/drm_init.c b/linux-core/drm_init.c
index d9d8e3a2..2d6b6a3c 100644
--- a/linux-core/drm_init.c
+++ b/linux-core/drm_init.c
@@ -64,18 +64,18 @@ static void DRM(parse_option)(char *s)
 	return;
 }
 
-/* drm_parse_options parse the insmod "drm=" options, or the command-line
+/* drm_parse_options parse the insmod "drm_opts=" options, or the command-line
  * options passed to the kernel via LILO.  The grammar of the format is as
  * follows:
  *
- * drm		::= 'drm=' option_list
+ * drm		::= 'drm_opts=' option_list
  * option_list	::= option [ ';' option_list ]
  * option	::= 'device:' major
  *		|   'debug'
  *		|   'noctx'
  * major	::= INTEGER
  *
- * Note that 's' contains option_list without the 'drm=' part.
+ * Note that 's' contains option_list without the 'drm_opts=' part.
  *
  * device=major,minor specifies the device number used for /dev/drm
  *	  if major == 0 then the misc device is used
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index bc958796..6811d6ba 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -121,11 +121,13 @@ static int DRM(stub_putminor)(int minor)
 	return 0;
 }
 
+
 int DRM(stub_register)(const char *name, struct file_operations *fops,
 		       drm_device_t *dev)
 {
 	struct drm_stub_info *i = NULL;
-	
+
+	DRM_DEBUG("\n");
 	if (register_chrdev(DRM_MAJOR, "drm", &DRM(stub_fops)))
 		i = (struct drm_stub_info *)inter_module_get("drm");
 
@@ -133,9 +135,11 @@ int DRM(stub_register)(const char *name, struct file_operations *fops,
 				/* Already registered */
 		DRM(stub_info).info_register   = i->info_register;
 		DRM(stub_info).info_unregister = i->info_unregister;
-	} else {
+		DRM_DEBUG("already registered\n");
+	} else if (DRM(stub_info).info_register != DRM(stub_getminor)) {
 		DRM(stub_info).info_register   = DRM(stub_getminor);
 		DRM(stub_info).info_unregister = DRM(stub_putminor);
+		DRM_DEBUG("calling inter_module_register\n");
 		inter_module_register("drm", THIS_MODULE, &DRM(stub_info));
 	}
 	if (DRM(stub_info).info_register)
diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c
index b6c95498..94e5d41c 100644
--- a/linux-core/tdfx_drv.c
+++ b/linux-core/tdfx_drv.c
@@ -44,6 +44,15 @@
 #define DRIVER_MINOR		0
 #define DRIVER_PATCHLEVEL	0
 
+static u_int DRM(idlist)[] = {
+	0x121A0003,				/* Banshee */
+	0x121A0005,				/* Voodoo3 */
+	0x121A0009,				/* Voodoo5 */
+	0
+};
+
+#define DRIVER_CARD_LIST DRM(idlist)
+
 
 #include "drm_auth.h"
 #include "drm_bufs.h"