upg strace mesa xorg-server

This commit is contained in:
joborun linux 2022-12-16 00:19:46 +02:00
parent 99c7664d37
commit f86a2bf370
14 changed files with 79 additions and 57 deletions

View File

@ -153,3 +153,4 @@ sha256sums=(SKIP
# build() {
#

View File

@ -4,8 +4,11 @@ Date: Sun, 12 Jun 2022 23:59:05 +0300
Subject: [PATCH] anv: force MEDIA_INTERFACE_DESCRIPTOR_LOAD reemit after
3D->GPGPU switch
Seems to fix a hang in Age of Empire 4 where the HW is hung on a
PIPE_CONTROL after a GPGPU_WALKER but no
Seems to fix a hang in the following titles :
- Age of Empire 4
- Monster Hunter Rise
where the HW is hung on a PIPE_CONTROL after a GPGPU_WALKER but no
MEDIA_INTERFACE_DESCRIPTOR_LOAD was emitted since the switch from 3D
to GPGPU.
@ -19,18 +22,27 @@ This would happen in the following case :
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
src/intel/vulkan/genX_cmd_buffer.c | 5 +++++
1 file changed, 5 insertions(+)
src/intel/vulkan/genX_cmd_buffer.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 1aa997f2ade2..2e9979c8f63e 100644
index d56f9037fde1..e03dc16c1fc5 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -5955,6 +5955,11 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
@@ -6001,6 +6001,20 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
}
#endif
+#if GFX_VERx10 == 120
+ /* Undocumented workaround to force the re-emission of
+ * MEDIA_INTERFACE_DESCRIPTOR_LOAD when switching from 3D to Compute
+ * pipeline without rebinding a pipeline :
+ * vkCmdBindPipeline(COMPUTE, cs_pipeline);
+ * vkCmdDispatch(...);
+ * vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
+ * vkCmdDraw(...);
+ * vkCmdDispatch(...);
+ */
+ if (pipeline == _3D)
+ cmd_buffer->state.compute.pipeline_dirty = true;
+#endif

View File

@ -8,8 +8,8 @@
pkgbase=mesa
pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd"
pkgver=22.3.0
pkgrel=03
pkgver=22.3.1
pkgrel=02
arch=('x86_64')
#options=('debug' '!lto') # uncomment this if you want the debug package built
options=('!lto')
@ -21,7 +21,7 @@ makedepends+=('rust' 'rust-bindgen' 'spirv-tools' 'spirv-llvm-translator') # ru
url="https://www.mesa3d.org/"
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
# 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
LICENSE)
prepare() {
@ -31,7 +31,7 @@ prepare() {
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247
# https://github.com/HansKristian-Work/vkd3d-proton/issues/1200
patch -Np1 -i ../0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
patch -Np1 -i ../0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
# patch -Np1 -i ../0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
}
build() {
@ -43,8 +43,8 @@ build() {
-D b_ndebug=true \
-D b_lto=false \
-D platforms=x11,wayland \
-D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,crocus,zink,d3d12 \
-D vulkan-drivers=amd,intel,swrast \
-D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink,d3d12 \
-D vulkan-drivers=amd,intel,intel_hasvk,swrast \
-D vulkan-layers=device-select,intel-nullhw,overlay \
-D dri3=enabled \
-D egl=enabled \
@ -126,8 +126,8 @@ package_vulkan-intel() {
optdepends=('vulkan-mesa-layers: additional vulkan layers')
provides=('vulkan-driver')
_install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
_install fakeinstall/usr/lib/libvulkan_intel.so
_install fakeinstall/usr/share/vulkan/icd.d/intel_*.json
_install fakeinstall/usr/lib/libvulkan_intel*.so
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
@ -196,7 +196,6 @@ package_mesa() {
# ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
_install fakeinstall/usr/lib/dri/*_dri.so
_install fakeinstall/usr/lib/bellagio
_install fakeinstall/usr/lib/d3d
_install fakeinstall/usr/lib/lib{gbm,glapi}.so*
@ -230,17 +229,14 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
'71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dylan@pnwbakers.com>
'57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>
sha256sums=(644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 # mesa-22.3.0.tar.xz
b93a48881d9528eae80620d9e72bf436a4a51110735ed78bbace590c36ff786e # mesa-22.3.0.tar.xz.sig
2c780f682710be86b9ff8aaab770be7edaa7bc4c3a13ba7b1ef5afcf2b5dc62b # 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
93c62083bda9a37ea582b96e1872878bff6efade95f724d5cf4e1964ee14d0bf # 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
sha256sums=(3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb # mesa-22.3.1.tar.xz
eddc89163eb98e2f51c93858c8cbe1c40da04a7e7e42e557e2cd95107ad61304 # mesa-22.3.1.tar.xz.sig
384868758a6d80924a21647f6892ba3d5ecad7d641cb3940d087d001f67aefeb # 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
sha512sums=('bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da'
'SKIP'
'4ff7c359f08aedb1fb6eb2c6bb34bafa399edfa7916cd6cce7844bb38795e84c0265324e3fc7d37237d4824f029cb04da176bcf476785fd2e35a8b0ce4f8a394'
'5dd0cb8affa9cfe6e7d94f59b8e23727036fd8ab76938321f8d266315f30611584da6f6277fe2aa920130483302adab5e57e2bc08f1bd3c62ea57b3e4b007305'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
sha512sums=('8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b'
'SKIP'
'ccdc1e367262338073b078f80795143026d08fa3fb720afda968907e1b4fa3b12e44edb441d3e17f6836f631319d1f1c3112699bea67014c3cf911fb9a816a3b'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')

View File

@ -6,8 +6,8 @@
pkgbase=mesa
pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
pkgdesc="An open-source implementation of the OpenGL specification"
pkgver=22.3.0
pkgrel=3
pkgver=22.3.1
pkgrel=2
arch=('x86_64')
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
@ -19,12 +19,10 @@ license=('custom')
options=('debug' '!lto')
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
LICENSE)
sha512sums=('bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da'
sha512sums=('8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b'
'SKIP'
'4ff7c359f08aedb1fb6eb2c6bb34bafa399edfa7916cd6cce7844bb38795e84c0265324e3fc7d37237d4824f029cb04da176bcf476785fd2e35a8b0ce4f8a394'
'5dd0cb8affa9cfe6e7d94f59b8e23727036fd8ab76938321f8d266315f30611584da6f6277fe2aa920130483302adab5e57e2bc08f1bd3c62ea57b3e4b007305'
'ccdc1e367262338073b078f80795143026d08fa3fb720afda968907e1b4fa3b12e44edb441d3e17f6836f631319d1f1c3112699bea67014c3cf911fb9a816a3b'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty@igalia.com>
@ -40,7 +38,6 @@ prepare() {
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247
# https://github.com/HansKristian-Work/vkd3d-proton/issues/1200
patch -Np1 -i ../0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
patch -Np1 -i ../0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
}
build() {
@ -52,8 +49,8 @@ build() {
-D b_ndebug=true \
-D b_lto=false \
-D platforms=x11,wayland \
-D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,crocus,zink,d3d12 \
-D vulkan-drivers=amd,intel,swrast \
-D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink,d3d12 \
-D vulkan-drivers=amd,intel,intel_hasvk,swrast \
-D vulkan-layers=device-select,intel-nullhw,overlay \
-D dri3=enabled \
-D egl=enabled \
@ -134,8 +131,8 @@ package_vulkan-intel() {
optdepends=('vulkan-mesa-layers: additional vulkan layers')
provides=('vulkan-driver')
_install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
_install fakeinstall/usr/lib/libvulkan_intel.so
_install fakeinstall/usr/share/vulkan/icd.d/intel_*.json
_install fakeinstall/usr/lib/libvulkan_intel*.so
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}

View File

@ -27,7 +27,6 @@ bison
byacc
polly
libmicrohttpd
rust
rust-bindgen
spirv-tools

View File

@ -9,7 +9,7 @@ pkgbase=postfix
pkgname=(postfix postfix-cdb postfix-ldap postfix-lmdb postfix-mysql
postfix-pcre postfix-pgsql postfix-sqlite)
pkgver=3.7.3
pkgrel=03
pkgrel=04
pkgdesc="Fast, easy to administer, secure mail server w/o systemd"
arch=(x86_64)
url="http://www.postfix.org/"
@ -241,3 +241,4 @@ sha256sums=(d22f3d37ef75613d5d573b56fc51ef097f2c0d0b0e407923711f71c1fb72911b #
825106bc3a6db8872160c5d65be04ad92828a043b8c8decc531341f0fe4a5742) # postfix.tmpfiles

View File

@ -7,7 +7,7 @@ pkgbase=postfix
pkgname=(postfix postfix-cdb postfix-ldap postfix-lmdb postfix-mysql
postfix-pcre postfix-pgsql postfix-sqlite)
pkgver=3.7.3
pkgrel=3
pkgrel=4
pkgdesc="Fast, easy to administer, secure mail server"
arch=(x86_64)
url="http://www.postfix.org/"

View File

@ -5,3 +5,4 @@ lmdb
mariadb-libs
db

View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=strace
pkgver=6.0
pkgver=6.1
pkgrel=01
pkgdesc='A diagnostic, debugging and instructional userspace tracer'
arch=(x86_64)
@ -38,5 +38,7 @@ license=(BSD)
validpgpkeys=('296D6F29A020808E8717A8842DB5BD89A340AEB7') # Dmitry V. Levin <ldv@altlinux.org>
sha256sums=(92d720a666855e9f1c6a11512fd6e99674a82bbfe1442557815f2ce8e1293338 # strace-6.0.tar.xz
cf9b4922340bfcbc9f58af10350d9c4156aadd57bac45cca1481f6facdb6ae1c) # strace-6.0.tar.xz.asc
sha256sums=(2579e9cec37dbb786f6ea0bebd15f40dd561ef2bde2a2a2ecdce5963b01859fd # strace-6.1.tar.xz
5e554917fba0c574aab96db7206580878d901063cac021bfcbd2fe9c8bce7182) # strace-6.1.tar.xz.asc

View File

@ -2,7 +2,7 @@
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=strace
pkgver=6.0
pkgver=6.1
pkgrel=1
pkgdesc='A diagnostic, debugging and instructional userspace tracer'
arch=(x86_64)
@ -10,7 +10,7 @@ url='https://strace.io/'
license=(BSD)
depends=(perl libunwind)
source=(https://github.com/strace/strace/releases/download/v$pkgver/strace-$pkgver.tar.xz{,.asc})
sha1sums=('6ac0fb07dbeb29a79e17d81f735aacb326a72c28'
sha1sums=('b451b02579bc473e5f0e559ce40be634026e3f2b'
'SKIP')
validpgpkeys=('296D6F29A020808E8717A8842DB5BD89A340AEB7') # Dmitry V. Levin <ldv@altlinux.org>

View File

@ -1,4 +1,6 @@
real 0m37.891s
user 1m2.078s
sys 0m8.749s
real 0m55.609s
user 0m50.206s
sys 0m7.401s

View File

@ -8,18 +8,18 @@
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
'xorg-server-common' 'xorg-server-devel')
pkgver=21.1.4
pkgrel=02
pkgver=21.1.5
pkgrel=01
arch=(x86_64)
groups=(xorg)
url="https://xorg.freedesktop.org"
#options=(debug) ## uncomment if you want the debug developers' pkg created
makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv' 'libxcvt'
'libxmu' 'libxrender' 'libxi' 'libxaw' 'libxtst' 'libxres'
'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms'
'libxshmfence' 'libunwind' 'meson' 'git')
#options=(debug) ## uncomment if you want the debug developers' pkg created
#source=(${pkgbase}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/xserver.git#commit=27a0ee32ccef8d621aaa758c804fc9a5ceeb5a56
source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig}
xvfb-run # with updates from FC master
@ -190,10 +190,11 @@ package_xorg-server-devel() {
license=('custom')
validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
#validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
sha256sums=(5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587 # xorg-server-21.1.4.tar.xz
c3053ee748f9b08d4afbaea098afa0a3adff374cb7ac10b4716cf8f773e3f251 # xorg-server-21.1.4.tar.xz.sig
sha256sums=(05b0c8301cee7c5a78083df421ba3a071891553541a417b3d85adf5cf20f8720 # xorg-server-21.1.5.tar.xz
d015ef2595d6205b25a6c935efecfd4d21e4880e25612e4400dc3b7fa7031afe # xorg-server-21.1.5.tar.xz.sig
a0a68505e3eb3ba6581388ae41b9dfd5208ec9b8983e78714778c20b71bc0ece # xvfb-run
2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 # xvfb-run.1
57316bf08e1934f983b03d085ca318dc27eaca9dc137c61ca62074ecfd5ede11 # xorg-server.install

View File

@ -1,10 +1,10 @@
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
'xorg-server-common' 'xorg-server-devel')
pkgver=21.1.4
pkgver=21.1.5
pkgrel=1
arch=('x86_64')
license=('custom')
@ -23,8 +23,9 @@ source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pk
xvfb-run.1
0002-xephyr_Dont_check_for_SeatId_anymore.patch
)
validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
sha512sums=('eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f'
#validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
sha512sums=('a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953'
'SKIP'
'87c79b4a928e74463f96f58d277558783eac9b8ea6ba00d6bbbb67ad84c4d65b3792d960ea2a70089ae18162e82ae572a49ad36df169c974cc99dbaa51f63eb2'
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'

9
xorg-server/conf Normal file
View File

@ -0,0 +1,9 @@
--enable-systemd-logind Build systemd-logind support (default: auto)
--with-systemd-daemon support systemd socket activation (default: auto)
SYSTEMD_DAEMON_CFLAGS
C compiler flags for SYSTEMD_DAEMON, overriding pkg-config
SYSTEMD_DAEMON_LIBS
linker flags for SYSTEMD_DAEMON, overriding pkg-config
--enable-ipv6 Enable IPv6 support
DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
DBUS_LIBS linker flags for DBUS, overriding pkg-config