From e72d60d8bf77887e7dbf8dac514a2cc369972635 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 25 Jan 2022 11:51:56 +1000 Subject: [PATCH] Add iris regression fix. Resolves: rhbz2016874 --- ...mplement-inter-context-busy-tracking.patch | 58 +++++++++++++++++++ mesa.spec | 11 +++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 0001-iris-implement-inter-context-busy-tracking.patch diff --git a/0001-iris-implement-inter-context-busy-tracking.patch b/0001-iris-implement-inter-context-busy-tracking.patch new file mode 100644 index 0000000..cc50a4b --- /dev/null +++ b/0001-iris-implement-inter-context-busy-tracking.patch @@ -0,0 +1,58 @@ +From 07dc3d4238e57901ccf98e0b506d9aad2c86b9d9 Mon Sep 17 00:00:00 2001 +From: Paulo Zanoni +Date: Mon, 10 Jan 2022 17:18:05 -0800 +Subject: [PATCH] iris: implement inter-context busy-tracking + +Previously, no buffers were ever marked as EXEC_OBJECT_ASYNC so the +Kernel would ensure dependency tracking for us. After we implemented +explicit busy tracking in commit 89a34cb8450a, only the external +objects kept relying on the Kernel's implicit tracking and Iris did +inter-batch busy tracking, meaning we lost inter-screen and +inter-context synchronization. This seemed fine to me since, as far as +I understood, it is the duty of the application to synchronize itself +against multiple screens and contexts. + +The problem here is that applications were actually relying on the old +behavior where the Kernel guarantees synchronization, so 89a34cb8450a +can be seen as a regression. This commit addresses the inter-context +synchronization case. + +Cc: mesa-stable +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5731 +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5812 +Fixes: 89a34cb8450a ("iris: switch to explicit busy tracking") +Tested-by: Konstantin Kharlamov +Signed-off-by: Paulo Zanoni +--- + src/gallium/drivers/iris/iris_batch.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c +index b7bde60aae7..1b0c5896d4f 100644 +--- a/src/gallium/drivers/iris/iris_batch.c ++++ b/src/gallium/drivers/iris/iris_batch.c +@@ -835,6 +835,12 @@ update_bo_syncobjs(struct iris_batch *batch, struct iris_bo *bo, bool write) + move_syncobj_to_batch(batch, &deps->write_syncobjs[other_batch_idx], + I915_EXEC_FENCE_WAIT); + ++ /* If it's being written by our screen, wait on it too. This is relevant ++ * when there are multiple contexts on the same screen. */ ++ if (deps->write_syncobjs[batch_idx]) ++ move_syncobj_to_batch(batch, &deps->write_syncobjs[batch_idx], ++ I915_EXEC_FENCE_WAIT); ++ + struct iris_syncobj *batch_syncobj = iris_batch_get_signal_syncobj(batch); + + if (write) { +@@ -847,6 +853,8 @@ update_bo_syncobjs(struct iris_batch *batch, struct iris_bo *bo, bool write) + + move_syncobj_to_batch(batch, &deps->read_syncobjs[other_batch_idx], + I915_EXEC_FENCE_WAIT); ++ move_syncobj_to_batch(batch, &deps->read_syncobjs[batch_idx], ++ I915_EXEC_FENCE_WAIT); + + } else { + /* If we're reading, replace the other read from our batch index. */ +-- +GitLab + diff --git a/mesa.spec b/mesa.spec index 89798c7..84aa469 100644 --- a/mesa.spec +++ b/mesa.spec @@ -58,7 +58,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 21.3.4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -68,6 +68,12 @@ Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source1: Mesa-MLAA-License-Clarification-Email.txt +# Patches to fix Intel blinking, see: +# https://gitlab.freedesktop.org/pzanoni/mesa/-/commit/07dc3d4238e57901ccf98e0b506d9aad2c86b9d9 +# https://bugzilla.redhat.com/show_bug.cgi?id=2036600 +# https://bugzilla.redhat.com/show_bug.cgi?id=2040771 +Patch0001: 0001-iris-implement-inter-context-busy-tracking.patch + BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ @@ -598,6 +604,9 @@ popd %endif %changelog +* Tue Jan 25 2022 Dave Airlie - 21.3.4-2 +- Add iris regression fix. + * Fri Jan 21 2022 Dave Airlie - 21.3.4-1 - Update to mesa 21.3.4 - contains gbm and memory leak fixes.