Stefan Dirsch
c5550f7b6b
* obsolete patches:
- dmx-silly.patch
- fixed-SYNC-extension-trigger-BlockHandler-test.diff
- sw_cursor_on_randr.patch
- xorg-evdev-conf.diff
- xorg-server-commit-21ed660.diff
- xorg-server-revert-event-mask.patch
- xorg-x11-server-gl-apps-crash.patch
* adjusted patches
- 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
- 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
- CVE-2010-2240-tree_depth_limit.patch
- cache-xkbcomp-output-for-fast-start-up.patch
- confine_to_shape.diff
- driver-autoconfig.diff
- fpic.diff
- xorg-detect-psb.patch
- xorg-server-1.8.0.diff
- xorg-server-nohwaccess.diff
- xorg-server-option_libxf86config.diff
- xorg-server-xf4vnc.patch
- xserver-1.6.1-nouveau.patch
- xserver-bg-none-root.patch
* vbe-bufferoverflow.diff
- fixes vbe buffer overflow
- disabled vnc build for now (standalone server + module)
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=281
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
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:
|