Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa
Commits: 2604dc3b by Timo Aaltonen at 2022-09-20T13:25:57+03:00 nv50-ir-fix-OP_UNION-resolving-when-used-for-vector.diff: Fix a regression on nouveau. (Closes: #1017499) - - - - - a905e5e4 by Timo Aaltonen at 2022-09-20T13:26:07+03:00 release to sid - - - - - 3 changed files: - debian/changelog - + debian/patches/nv50-ir-fix-OP_UNION-resolving-when-used-for-vector.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +mesa (22.2.0~rc3-2) unstable; urgency=medium + + * nv50-ir-fix-OP_UNION-resolving-when-used-for-vector.diff: Fix a + regression on nouveau. (Closes: #1017499) + + -- Timo Aaltonen <tjaal...@debian.org> Tue, 20 Sep 2022 13:25:59 +0300 + mesa (22.2.0~rc3-1) unstable; urgency=medium * New upstream release candidate. ===================================== debian/patches/nv50-ir-fix-OP_UNION-resolving-when-used-for-vector.diff ===================================== @@ -0,0 +1,41 @@ +From b23b94fbc9201368398823ccdc633cf1fa60127c Mon Sep 17 00:00:00 2001 +From: Karol Herbst <kher...@redhat.com> +Date: Thu, 1 Sep 2022 21:45:20 +0200 +Subject: [PATCH] nv50/ir: fix OP_UNION resolving when used for vector values + +When an OP_UNION def takes part in a vector source e.g. for a tex +instruction we failed to clean up the OP_UNION instruction as rep() points +towards the coalesced value instead. + +This fixes a regression on nv50 moving to NIR, but also potentially issues +with nvc0. + +The main reason this is common in nv50 is, that we lower OP_SLCT to a set, +predicated movs and a union. + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6406 +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7117 +Cc: mesa-stable +Signed-off-by: Karol Herbst <kher...@redhat.com> +Reviewed-by: M Henning <dra...@darkrefraction.com> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18377> +--- + src/nouveau/codegen/nv50_ir_peephole.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nouveau/codegen/nv50_ir_peephole.cpp b/src/nouveau/codegen/nv50_ir_peephole.cpp +index 4e2b3e6f52c..9088e614f7e 100644 +--- a/src/nouveau/codegen/nv50_ir_peephole.cpp ++++ b/src/nouveau/codegen/nv50_ir_peephole.cpp +@@ -53,7 +53,7 @@ Instruction::isNop() const + if (!getDef(0)->equals(getSrc(0))) + return false; + if (op == OP_UNION) +- if (!def(0).rep()->equals(getSrc(1))) ++ if (!getDef(0)->equals(getSrc(1))) + return false; + return true; + } +-- +2.37.2 + ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ 07_gallium-fix-build-failure-on-powerpcspe.diff path_max.diff src_glx_dri_common.h.diff +nv50-ir-fix-OP_UNION-resolving-when-used-for-vector.diff View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/8f729c0b2241a529350bfcf58599ec7d8eb57341...a905e5e4425437b8a2a8cfba1768925de66caa84 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/8f729c0b2241a529350bfcf58599ec7d8eb57341...a905e5e4425437b8a2a8cfba1768925de66caa84 You're receiving this email because of your account on salsa.debian.org.
