xorg-x11-server/driver-autoconfig.diff

--- hw/xfree86/common/xf86pciBus.c
+++ hw/xfree86/common/xf86pciBus.c
@@ -176,7 +176,11 @@
 	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] = "radeonhd";
+		driverList[2] = "ati";
+		break;
 	case 0x102c:		    driverList[0] = "chips"; break;
 	case 0x1013:		    driverList[0] = "cirrus"; break;
 	case 0x3d3d:		    driverList[0] = "glint"; break;
@@ -192,8 +196,20 @@
 	    break;
 	case 0x102b:		    driverList[0] = "mga";	break;
 	case 0x10c8:		    driverList[0] = "neomagic"; break;
-	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
-	case 0x1106:		    driverList[0] = "openchrome"; break;
+	case 0x12d2:		    driverList[0] = "nv";	break;
+	case 0x10de:
+		driverList[0] = "nvidia";
+		driverList[1] = "nouveau";
+		/* GeForce 6150SE support broken (bnc #465190/544674) */
+		if (dev->device_id != 0x03D0) {
+			driverList[2] = "nv";
+		}
+		break;
+	case 0x1106:
+		driverList[0] = "via";
+		driverList[1] = "openchrome";
+		driverList[2] = "unichrome";
+		break;
         case 0x1b36:		    driverList[0] = "qxl"; break;
 	case 0x1163:		    driverList[0] = "rendition"; break;
 	case 0x5333:
Updating link to change in openSUSE:Factory/xorg-x11-server revision 176.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=bb0cc16d2f571f87db43a12ff2a2cf70 2010-08-26 11:09:27 +02:00			`--- hw/xfree86/common/xf86pciBus.c`
			`+++ hw/xfree86/common/xf86pciBus.c`
Accepting request 29877 from X11:XOrg Copy from X11:XOrg/xorg-x11-server based on submit request 29877 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/29877 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=153 2010-01-18 14:04:02 +01:00			`@@ -176,7 +176,11 @@`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=127 2009-06-06 01:12:56 +02:00			`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] = "radeonhd";`
			`+ driverList[2] = "ati";`
			`+ break;`
			`case 0x102c: driverList[0] = "chips"; break;`
			`case 0x1013: driverList[0] = "cirrus"; break;`
Accepting request 29877 from X11:XOrg Copy from X11:XOrg/xorg-x11-server based on submit request 29877 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/29877 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=153 2010-01-18 14:04:02 +01:00			`case 0x3d3d: driverList[0] = "glint"; break;`
			`@@ -192,8 +196,20 @@`
			`break;`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=127 2009-06-06 01:12:56 +02:00			`case 0x102b: driverList[0] = "mga"; break;`
			`case 0x10c8: driverList[0] = "neomagic"; break;`
			`- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;`
Accepting request 29877 from X11:XOrg Copy from X11:XOrg/xorg-x11-server based on submit request 29877 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/29877 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=153 2010-01-18 14:04:02 +01:00			`- case 0x1106: driverList[0] = "openchrome"; break;`
Accepting request 35298 from home:oertel:branches:openSUSE:Factory Copy from home:oertel:branches:openSUSE:Factory/xorg-x11-server via accept of submit request 35298 revision 8. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/35298 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=229 2010-03-20 03:42:15 +01:00			`+ case 0x12d2: driverList[0] = "nv"; break;`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=127 2009-06-06 01:12:56 +02:00			`+ case 0x10de:`
			`+ driverList[0] = "nvidia";`
			`+ driverList[1] = "nouveau";`
Accepting request 21946 from X11:XOrg Copy from X11:XOrg/xorg-x11-server based on submit request 21946 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/21946 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=145 2009-10-08 01:29:06 +02:00			`+ /* GeForce 6150SE support broken (bnc #465190/544674) */`
			`+ if (dev->device_id != 0x03D0) {`
			`+ driverList[2] = "nv";`
			`+ }`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=127 2009-06-06 01:12:56 +02:00			`+ break;`
Accepting request 29877 from X11:XOrg Copy from X11:XOrg/xorg-x11-server based on submit request 29877 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/29877 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=153 2010-01-18 14:04:02 +01:00			`+ case 0x1106:`
Accepting request 25245 from X11:XOrg Copy from X11:XOrg/xorg-x11-server based on submit request 25245 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/25245 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=151 2009-12-02 12:28:35 +01:00			`+ driverList[0] = "via";`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=127 2009-06-06 01:12:56 +02:00			`+ driverList[1] = "openchrome";`
			`+ driverList[2] = "unichrome";`
			`+ break;`
Accepting request 35298 from home:oertel:branches:openSUSE:Factory Copy from home:oertel:branches:openSUSE:Factory/xorg-x11-server via accept of submit request 35298 revision 8. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/35298 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=229 2010-03-20 03:42:15 +01:00			`case 0x1b36: driverList[0] = "qxl"; break;`
Accepting request 29877 from X11:XOrg Copy from X11:XOrg/xorg-x11-server based on submit request 29877 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/29877 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=153 2010-01-18 14:04:02 +01:00			`case 0x1163: driverList[0] = "rendition"; break;`
			`case 0x5333:`