Date: Saturday, March 18, 2023 @ 01:10:13
Author: heftig
Revision: 1421544
23.0.0-3: glslang rebuild
Modified:
lib32-mesa/trunk/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
lib32-mesa/trunk/0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
lib32-mesa/trunk/0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
lib32-mesa/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch | 3 +++
0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch | 10
+++++++---
0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch | 8 ++++++--
PKGBUILD | 8 ++++----
4 files changed, 20 insertions(+), 9 deletions(-)
Modified: 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
===================================================================
--- 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2023-03-18 00:07:04 UTC (rev 1421543)
+++ 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2023-03-18 01:10:13 UTC (rev 1421544)
@@ -21,6 +21,9 @@
vkCmdDispatch(...);
Signed-off-by: Lionel Landwerlin <[email protected]>
+Reviewed-by: Ivan Briano <[email protected]>
+Cc: mesa-stable
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247>
---
src/intel/vulkan/genX_cmd_buffer.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
Modified: 0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
===================================================================
--- 0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
2023-03-18 00:07:04 UTC (rev 1421543)
+++ 0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
2023-03-18 01:10:13 UTC (rev 1421544)
@@ -2,6 +2,9 @@
From: Kai-Heng Feng <[email protected]>
Date: Thu, 29 Dec 2022 13:43:27 +0800
Subject: [PATCH] iris: Retry DRM_IOCTL_I915_GEM_EXECBUFFER2 on ENOMEM
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
We are seeing endless DRM_IOCTL_SYNCOBJ_WAIT ioctl when system memory is
under pressured.
@@ -17,14 +20,15 @@
enough memory. Once the batch is submiited and snapshots_landed gets
flipped, iris_get_query_result() can proceed normally.
+Reviewed-by: José Roberto de Souza <[email protected]>
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6851
-(cherry picked from commit 3b38add239795fa5fe97ae37e6ec62cab4f1f968)
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449>
---
src/gallium/drivers/iris/iris_batch.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/iris/iris_batch.c
b/src/gallium/drivers/iris/iris_batch.c
-index c7a08a0e1f5f..9e7b43f1dc2c 100644
+index c7a08a0e1f5f..deab85ce4aaf 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -981,9 +981,14 @@ submit_batch(struct iris_batch *batch)
@@ -40,7 +44,7 @@
+ } while (ret && errno == ENOMEM);
+
+ if (ret)
-+ ret = -errno;
++ ret = -errno;
+ }
simple_mtx_unlock(bo_deps_lock);
Modified: 0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
===================================================================
--- 0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
2023-03-18 00:07:04 UTC (rev 1421543)
+++ 0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
2023-03-18 01:10:13 UTC (rev 1421544)
@@ -2,6 +2,9 @@
From: Kai-Heng Feng <[email protected]>
Date: Thu, 29 Dec 2022 14:01:31 +0800
Subject: [PATCH] Revert "iris: Avoid abort() if kernel can't allocate memory"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
This reverts commit f9d8d9acbb6a620684fb4dac4affe25816587d92.
@@ -8,13 +11,14 @@
Now ENOMEM is handled in submit_batch(), we don't need to check it for
resetting anymore.
-(cherry picked from commit e6add12416315b77a420dc8ccb59307ada663a1d)
+Reviewed-by: José Roberto de Souza <[email protected]>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449>
---
src/gallium/drivers/iris/iris_batch.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/gallium/drivers/iris/iris_batch.c
b/src/gallium/drivers/iris/iris_batch.c
-index 9e7b43f1dc2c..5942fcf9c00e 100644
+index deab85ce4aaf..2993f0ab7ee8 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -1097,9 +1097,8 @@ _iris_batch_flush(struct iris_batch *batch, const char
*file, int line)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-18 00:07:04 UTC (rev 1421543)
+++ PKGBUILD 2023-03-18 01:10:13 UTC (rev 1421544)
@@ -7,7 +7,7 @@
pkgname=('lib32-vulkan-mesa-layers' 'lib32-opencl-mesa' 'lib32-vulkan-intel'
'lib32-vulkan-radeon' 'lib32-vulkan-virtio' 'lib32-libva-mesa-driver'
'lib32-mesa-vdpau' 'lib32-mesa')
pkgdesc="An open-source implementation of the OpenGL specification (32-bit)"
pkgver=23.0.0
-pkgrel=2
+pkgrel=3
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11'
'xorgproto' 'lib32-libdrm'
'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage'
'lib32-libvdpau'
@@ -24,9 +24,9 @@
LICENSE)
sha512sums=('127e2759a2a31cacd65a0891719ab7bb4a9188844022b4bccaebbedce9c550b9ccb160ad519178ea0d851c4bcb8f0f56febda248ed2ba82b5ddf804855e4694b'
'SKIP'
-
'fb89a3cc9801f259faa7da81b12b8e003fcef10b64a30abf5592a159859c9f39941c8042f89fa93dee4d4e107c139ccdb48f255f45a72b6f9c7ce0da5bd0bd56'
-
'27018f163dd93e492c5d6080690ee6aae7f63de80c014e941a2e42a5eca87cf14de5ec8a35a51472f9b204839b43b14ac663a6095c1c7ef8dd7f8a3861fb936a'
-
'd7a54efea5a4be9d893c67b97fc846a45ef148c1bc1057ed91c377086d8f18aaa49eab5f9b3f3557e82457f8e23c2b8727b62880003529e1fe364b7ea15daccf'
+
'c7832724bad137461fcdffc3db8ba653ea25c56b5980d7c45955844a543ce57ec4360e88e73ab48f7cb69717a2f467a03aca13ede3591f27e36e20409f8982e8'
+
'b089a84333743f2f69889f99903616a9dab28e45edf2de7b1f64d29bbb321daaf898aa05bf60fea6d2feec6b5ff072b807d76bb21efe122ff1a15e275d8acc97'
+
'ac4f1f98c5f1d0c2f875c2cf964fe60f41385b18a3507fea77f899f0cbbbea0baee92d313936f2d325c2301a7d0dfe3294bf881722fb22fa41defd4e4fbd0f98'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov
<[email protected]>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez
<[email protected]>
