xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86AutoConfig.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 9643e8d3482a35d355a243db7aa397ad47f29be0
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Aug 1 11:35:47 2008 -0400

    Handle XGI cards in autoconfig.
    
    It's all a bit wonky since both sis(4) and xgi(4) claim to support the
    Volari Z7 and V5/8 (0x0020 and 0x0040), so let's side with xgi(4), why
    not.  Note that the V3 (not V3XT) identifies itself as a trident chip.

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 45c42e1..5f96711 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -204,6 +204,12 @@ videoPtrToDriverList(struct pci_device *dev,
 	case 0x100c:		    driverList[0] = "tseng";	break;
 	case 0x1106:		    driverList[0] = "openchrome"; break;
 	case 0x15ad:		    driverList[0] = "vmware";	break;
+	case 0x18ca:
+	    if (dev->device_id == 0x47)
+		driverList[0] = "xgixp";
+	    else
+		driverList[0] = "xgi";
+	    break;
 	default: break;
     }
     for (i = 0; (i < returnListMax) && (driverList[i] != NULL); i++) {