diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-03-19 14:03:53 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-03-19 14:03:53 +0000 |
| commit | 604648da116336a299bd9ff21f9c32c9b401a5c4 (patch) | |
| tree | 65ee74ba58b02bbcdd2f5b8622efe168e7ab83cc /contrib/packages/rpm/sle11/SOURCES/xorg-detect-psb.patch | |
| parent | 266eec4ecf338f3f08771f8dfe79dbd5d9da00a1 (diff) | |
| download | tigervnc-604648da116336a299bd9ff21f9c32c9b401a5c4.tar.gz tigervnc-604648da116336a299bd9ff21f9c32c9b401a5c4.zip | |
Backport the contrib directory from trunk as well as our new buildv1.3.11.3-branch
system relies on it.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_3@5173 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'contrib/packages/rpm/sle11/SOURCES/xorg-detect-psb.patch')
| -rw-r--r-- | contrib/packages/rpm/sle11/SOURCES/xorg-detect-psb.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/contrib/packages/rpm/sle11/SOURCES/xorg-detect-psb.patch b/contrib/packages/rpm/sle11/SOURCES/xorg-detect-psb.patch new file mode 100644 index 00000000..9b8ce29a --- /dev/null +++ b/contrib/packages/rpm/sle11/SOURCES/xorg-detect-psb.patch @@ -0,0 +1,25 @@ +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; |