1
0
xorg-x11-server/xorg-detect-psb.patch
Stefan Dirsch ebdc01ee77 Accepting request 114753 from home:dimstar:branches:X11:XOrg
Udpate to Xorg 1.12.1... add 'automatic' ABI provides, which are verified during build to be true to ensure we can't ever publish a package which does not contain correct provides for the ABI

OBS-URL: https://build.opensuse.org/request/show/114753
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=383
2012-04-20 09:32:05 +00:00

35 lines
977 B
Diff

Index: xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c
===================================================================
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86pciBus.c
+++ xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c
@@ -1124,14 +1124,21 @@ videoPtrToDriverList(struct pci_device *
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: