Attachment 238945 Details for Bug 268327 – Add upstream patch to the graphics/mesa-dri port.

[patch] Add upstream patch to the graphics/mesa-dri port.

graphics-mesa-dri-Fix-a-crash-for-radeon-r600-graphi.patch (text/plain), 1.94 KB, created by Florian Walpen on 2022-12-20 17:11:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Walpen

Created: 2022-12-20 17:11:14 UTC

Size: 1.94 KB

patch

obsolete

>From 5faa3640da454a5c70ff66bc7a0e8d5addfebcee Mon Sep 17 00:00:00 2001
>From: Florian Walpen <dev@submerge.ch>
>Date: Tue, 20 Dec 2022 17:55:02 +0100
>Subject: [PATCH] graphics/mesa-dri: Fix a crash for radeon r600 graphic cards.
>
>Add an upstream patch to fix an immediate crash of Xorg and wayland
>on systems with radeon r600 based graphic cards. See:
>
>https://gitlab.freedesktop.org/mesa/mesa/-/issues/7931
>
>PR: 268327
>---
> graphics/mesa-dri/Makefile                       |  1 +
> ...c_gallium_drivers_r600_sfn_sfn__optimizer.cpp | 16 ++++++++++++++++
> 2 files changed, 17 insertions(+)
> create mode 100644 graphics/mesa-dri/files/patch-src_gallium_drivers_r600_sfn_sfn__optimizer.cpp
>
>diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
>index 94c8503053a7..9528ab8b625d 100644
>--- a/graphics/mesa-dri/Makefile
>+++ b/graphics/mesa-dri/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	mesa-dri
> PORTVERSION=	${MESAVERSION}
>+PORTREVISION=	1
> CATEGORIES=	graphics
> 
> COMMENT=	OpenGL hardware acceleration drivers for DRI2+
>diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_r600_sfn_sfn__optimizer.cpp b/graphics/mesa-dri/files/patch-src_gallium_drivers_r600_sfn_sfn__optimizer.cpp
>new file mode 100644
>index 000000000000..56fb029e3fcd
>--- /dev/null
>+++ b/graphics/mesa-dri/files/patch-src_gallium_drivers_r600_sfn_sfn__optimizer.cpp
>@@ -0,0 +1,16 @@
>+--- src/gallium/drivers/r600/sfn/sfn_optimizer.cpp.orig	2022-12-14 21:06:11 UTC
>++++ src/gallium/drivers/r600/sfn/sfn_optimizer.cpp
>+@@ -354,7 +354,12 @@ CopyPropFwdVisitor::visit(AluInstr *instr)
>+    auto src = instr->psrc(0);
>+    auto dest = instr->dest();
>+ 
>+-   for (auto& i : dest->uses()) {
>++   auto ii = dest->uses().begin();
>++   auto ie = dest->uses().end();
>++
>++   while(ii != ie) {
>++      auto i = *ii;
>++      ++ii;
>+       /* SSA can always be propagated, registers only in the same block
>+        * and only if they are assigned in the same block */
>+       bool can_propagate = dest->is_ssa();
>-- 
>2.38.1
>

Actions: View | Diff

Attachments on bug 268327: 238734 | 238746 | 238895 | 238898 | 238934 | 238935 | 238945 | 238950 | 238951