Re: X -configure seems to choose wrong driver for CT65555 video hardware

Matthieu Herrb <[email protected]> Tue, 30 Jun 2009 08:47:21 +0200
Newsgroups gmane.os.openbsd.x11
Message-ID <[email protected]>
Matthieu Herrb wrote:
> beasley wrote:
> [Lots of test reports]
> 
> Thanks for all this data. I think I now have an idea where the problem
> is. I'll try to send you a patch to test later today.
> 
Here's the patch to test.

-- 
Matthieu Herrb
? log
Index: src/ct_driver.c
===================================================================
RCS file: /cvs/xenocara/driver/xf86-video-chips/src/ct_driver.c,v
retrieving revision 1.3
diff -u -r1.3 ct_driver.c
--- src/ct_driver.c	7 Mar 2009 11:22:09 -0000	1.3
+++ src/ct_driver.c	30 Jun 2009 06:46:07 -0000
@@ -480,14 +480,14 @@
   { PCI_VENDOR_CHIPSTECH, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
 
 static const struct pci_id_match chips_device_match[] = {
-  CHIPS_DEVICE_MATCH(PCI_CHIP_65545, 0),
-  CHIPS_DEVICE_MATCH(PCI_CHIP_65548, 0),
-  CHIPS_DEVICE_MATCH(PCI_CHIP_65550, 0),
-  CHIPS_DEVICE_MATCH(PCI_CHIP_65554, 0),
-  CHIPS_DEVICE_MATCH(PCI_CHIP_65555, 0),
-  CHIPS_DEVICE_MATCH(PCI_CHIP_68554, 0),
-  CHIPS_DEVICE_MATCH(PCI_CHIP_69000, 0),
-  CHIPS_DEVICE_MATCH(PCI_CHIP_69030, 0),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65545, CHIPS_CT65545),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65548, CHIPS_CT65548),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65550, CHIPS_CT65550),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65554, CHIPS_CT65554),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_65555, CHIPS_CT65555),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_68554, CHIPS_CT68554),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_69000, CHIPS_CT69000),
+  CHIPS_DEVICE_MATCH(PCI_CHIP_69030, CHIPS_CT69030),
   { 0, 0, 0 },
 };
 #endif
@@ -813,7 +813,7 @@
 
     if (!setupDone) {
 	setupDone = TRUE;
-        xf86AddDriver(&CHIPS, module, 0);
+        xf86AddDriver(&CHIPS, module, HaveDriverFuncs);
 
 	/*
 	 * Modules that this driver always requires can be loaded here