From addce63adb18aea9025ba1e08d04ccbd22e3cb98 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 18 Jan 2021 13:50:16 +0000 Subject: Mon Jan 18 13:50:16 UTC 2021 Hey folks, a little status update here. First, huge thanks are due to nobodino for helping to shake out packages that weren't building from source. With all those fixes in place (plus a few more), we have tested and found that everything in the tree compiles cleanly against glibc-2.32. So, the plan is to have another mass rebuild soon against that. Although the ABI didn't technically change, I've heard that libpthread may not be 100% compatible in some corner cases, so we'll err on the side of caution. Hopefully we can get a little testing done on the recompiled system and then go through it all again at the beginning of next month when glibc-2.33 is released. Other than that, how's Mesa working these days? If there are still issues that are resolved by dropping back to the previous branch, let's try to figure those out. I'd rather not revert Mesa unless there's no other choice. I'm hoping that the (probably unrelated) issues with Intel video hardware will be helped by today's xorg-server patch that uses the modesetting driver with newer chipsets. Please report any improvement on the LQ thread. Beta approaches. :-) a/sysklogd-2.2.0-x86_64-1.txz: Upgraded. d/distcc-3.3.5-x86_64-2.txz: Rebuilt. Properly install distccmon-gnome.desktop. Thanks to marco70. d/python-setuptools-51.3.3-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_58-x86_64-1.txz: Upgraded. l/libodfgen-0.1.8-x86_64-1.txz: Upgraded. l/libsigsegv-2.13-x86_64-1.txz: Upgraded. n/inetd-1.79s-x86_64-12.txz: Rebuilt. Rebuilt to link with libtirpc. Thanks to nobodino. n/nftables-0.9.8-x86_64-1.txz: Upgraded. n/postfix-3.5.9-x86_64-1.txz: Upgraded. n/tcp_wrappers-7.6-x86_64-4.txz: Rebuilt. Use strerror(), not sys_errlist(). Thanks to nobodino. x/xorg-server-1.20.10-x86_64-3.txz: Rebuilt. Only use the Intel DDX with pre-gen4 hardware. Newer hardware will use the modesetting driver. x/xorg-server-xephyr-1.20.10-x86_64-3.txz: Rebuilt. x/xorg-server-xnest-1.20.10-x86_64-3.txz: Rebuilt. x/xorg-server-xvfb-1.20.10-x86_64-3.txz: Rebuilt. x/xorg-server-xwayland-1.20.10-x86_64-3.txz: Rebuilt. xfce/xfce4-appfinder-4.16.1-x86_64-1.txz: Upgraded. --- source/x/x11/build/xorg-server | 2 +- source/x/x11/patch/xorg-server.patch | 3 +++ .../xorg-server/06_use-intel-only-on-pre-gen4.diff | 30 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 source/x/x11/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff (limited to 'source/x') 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 + +--- 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; + } -- cgit v1.2.3