Applied all debian/patches from glsdk-6_00_00_07 release

[glsdk/xserver.git] / hw / xfree86 / common / xf86pciBus.c

diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 447b19229aea5e84ec49f48ed1bfbbdaa366c87a..70b3952304a83f25e0a3e6be6c8bb7c1109d8c18 100644 (file)
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -147,8 +147,8 @@ xf86PciProbe(void)
                    primaryBus.id.pci = info;
                } else {
                    xf86Msg(X_NOTICE,
-                           "More than one possible primary device found\n");
-                   primaryBus.type ^= (BusType)(-1);
+                           "More than one possible primary device found.  Using first one seen.\n");
+                    break;
                }
            }
        }
@@ -1107,7 +1107,10 @@ videoPtrToDriverList(struct pci_device *dev,
        case 0x1142:                driverList[0] = "apm"; break;
        case 0xedd8:                driverList[0] = "ark"; break;
        case 0x1a03:                driverList[0] = "ast"; break;
-       case 0x1002:                driverList[0] = "ati"; break;
+       case 0x1002:
+           driverList[0] = "fglrx";
+           driverList[1] = "ati";
+           break;
        case 0x102c:                driverList[0] = "chips"; break;
        case 0x1013:                driverList[0] = "cirrus"; break;
        case 0x3d3d:                driverList[0] = "glint"; break;
@@ -1123,7 +1126,25 @@ videoPtrToDriverList(struct pci_device *dev,
            break;
        case 0x102b:                driverList[0] = "mga";      break;
        case 0x10c8:                driverList[0] = "neomagic"; break;
-       case 0x10de: case 0x12d2:   driverList[0] = "nv";       break;
+       case 0x10de: case 0x12d2:
+           driverList[0] = "nvidia";
+           switch (dev->device_id) {
+           /* NV1 */
+           case 0x0008:
+           case 0x0009:
+               driverList[1] = "vesa";
+               break;
+           /* NV3 */
+           case 0x0018:
+           case 0x0019:
+               driverList[1] = "nv";
+               break;
+           default:
+               driverList[1] = "nouveau";
+               driverList[2] = "nv";
+               break;
+           }
+           break;
        case 0x1106:                driverList[0] = "openchrome"; break;
         case 0x1b36:               driverList[0] = "qxl"; break;
        case 0x1163:                driverList[0] = "rendition"; break;