forked from pool/xorg-x11-server
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
26 lines
964 B
Diff
26 lines
964 B
Diff
Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86pciBus.c
|
|
===============================================================================
|
|
--- xorg-server-1.7.99/hw/xfree86/common/xf86pciBus.c
|
|
+++ xorg-server-1.7.99/hw/xfree86/common/xf86pciBus.c
|
|
@@ -186,12 +186,14 @@
|
|
case 0x3d3d: driverList[0] = "glint"; break;
|
|
case 0x105d: driverList[0] = "i128"; break;
|
|
case 0x8086:
|
|
- if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
|
|
- driverList[0] = "i740";
|
|
- } else if (dev->device_id == 0x8108) {
|
|
- break; /* "hooray" for poulsbo */
|
|
- } else {
|
|
- driverList[0] = "intel";
|
|
+ switch (dev->device_id)
|
|
+ {
|
|
+ case 0x00d1: case 0x7800:
|
|
+ driverList[0] = "i740"; break;
|
|
+ case 0x8109: case 0x8108: case 0x4102:
|
|
+ driverList[0] = "psb"; driverList[1] = "psb_drv"; break;
|
|
+ default:
|
|
+ driverList[0] = "intel"; break;
|
|
}
|
|
break;
|
|
case 0x102b: driverList[0] = "mga"; break;
|