mesa: 22.3.7 -> 23.0.1

This commit is contained in:
Tim Biermann 2023-03-26 18:46:38 +02:00
parent cee3391580
commit e9a6dc158d
Signed by: tb
GPG Key ID: 42F8B4E30B673606
3 changed files with 5 additions and 61 deletions

View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/xorg.pub
RWTSGWF5Q7TndLHAkTZIED8LjrxOauACSvmsvXwa14w3LjsAspKUXLg+b3G8bJVUzR3GNiGA4Um1Wemog8ubR9G9A+YQpnVbOQ8=
SHA256 (Pkgfile) = bd3725525df3369a2aa52a66ba5f5285ddfd792f1f6922eadb945aa0ef6152f7
RWTSGWF5Q7TndIlER/uXjnf92xEAwKYfAQAr5VAUeFsbQOnovLg+fuChhamsPBsINLIlO/61AYss9EyDVFpzMUZ2a85G3ml+8ws=
SHA256 (Pkgfile) = 231f3e50701032ae5f50db50368bdf4799a23226d737e2845ea01f986899cae2
SHA256 (.footprint) = 0a096e4a6066d23884d972266fbb66a32fe44c44877cebc2b82d4a9c694ece1e
SHA256 (mesa-22.3.7.tar.xz) = 894ce2f4a1c2e76177cdd2284620192d0da3066b243eec2fbb1d7cf37f13042c
SHA256 (0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch) = 384868758a6d80924a21647f6892ba3d5ecad7d641cb3940d087d001f67aefeb
SHA256 (mesa-23.0.1.tar.xz) = e8e586856b55893abae9bdcdb98b41c081d909bb1faf372e6e7262307bf34adf

View File

@ -1,52 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
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 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.
This would happen in the following case :
vkCmdBindPipeline(COMPUTE, cs_pipeline);
vkCmdDispatch(...);
vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
vkCmdDraw(...);
vkCmdDispatch(...);
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
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 d56f9037fde1..e03dc16c1fc5 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -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
+
/* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
* PIPELINE_SELECT [DevBWR+]":
*

View File

@ -5,10 +5,9 @@
# Optional: libva libvdpau wayland-protocols
name=mesa
version=22.3.7
version=23.0.1
release=1
source=(https://archive.mesa3d.org/$name-$version.tar.xz
0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch)
source=(https://archive.mesa3d.org/$name-$version.tar.xz)
build() {
prt-get isinst vulkan-loader && PKGMK_MESA_GALLIUM+='zink,'
@ -21,8 +20,6 @@ build() {
CFLAGS+=' -mtls-dialect=gnu'
CXXFLAGS+=' -mtls-dialect=gnu'
patch -Np1 -d mesa-$version -i $SRC/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
meson setup build mesa-$version $PKGMK_MESA \
--prefix=/usr \
--sysconfdir=/etc \