diff options
Diffstat (limited to 'source/x')
| -rw-r--r-- | source/x/x11/build/xorg-server | 2 | ||||
| -rw-r--r-- | source/x/x11/patch/xorg-server.patch | 3 | ||||
| -rw-r--r-- | source/x/x11/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff | 30 |
3 files changed, 34 insertions, 1 deletions
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server index 0cfbf0888..00750edc0 100644 --- a/source/x/x11/build/xorg-server +++ b/source/x/x11/build/xorg-server @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch index f670b4178..e1e5d20f6 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -25,3 +25,6 @@ zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-Ge # Fix a PCI related segfault: zcat $CWD/patch/xorg-server/fix-pci-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + +# Only use Intel DDX with pre-gen4 hardware. Newer hardware will the the modesetting driver by default: +zcat $CWD/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff b/source/x/x11/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff new file mode 100644 index 000000000..4994492f6 --- /dev/null +++ b/source/x/x11/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff @@ -0,0 +1,30 @@ +Description: Use intel ddx only on pre-gen4 hw, newer ones will fall back to modesetting +Author: Timo Aaltonen <tjaalton@debian.org> + +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_devi + case 0x0bef: + /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */ + break; +- default: ++ /* Default to intel only on pre-gen4 chips */ ++ case 0x3577: ++ case 0x2562: ++ case 0x3582: ++ case 0x358e: ++ case 0x2572: ++ case 0x2582: ++ case 0x258a: ++ case 0x2592: ++ case 0x2772: ++ case 0x27a2: ++ case 0x27ae: ++ case 0x29b2: ++ case 0x29c2: ++ case 0x29d2: ++ case 0xa001: ++ case 0xa011: + driverList[0] = "intel"; + break; + } |