- U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch

* Fixes: 58b512ddd6e - radeonsi: execute clears at resource 
    allocation using compute instead of gfx
  * Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12310

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1369
This commit is contained in:
Stefan Dirsch 2025-01-31 23:47:57 +00:00 committed by Git OBS Bridge
parent 67372cdeca
commit 2913e6c94e
3 changed files with 51 additions and 0 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jan 31 23:39:37 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
- U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch
* Fixes: 58b512ddd6e - radeonsi: execute clears at resource
allocation using compute instead of gfx
* Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12310
-------------------------------------------------------------------
Wed Jan 22 22:10:01 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -203,6 +203,9 @@ Patch500: u_dep_xcb.patch
Patch500: u_dep_xcb-s390x.patch
%endif
%ifnarch s390x
Patch600: U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch
%endif
%ifnarch s390x
Patch1222040: u_mesa-CVE-2023-45913.patch
%else
Patch1222040: u_mesa-CVE-2023-45913-s390x.patch
@ -882,6 +885,9 @@ cp %{SOURCE6} subprojects/packagecache/
%patch -P 100 -p1
%patch -P 400 -p1
%patch -P 500 -p1
%ifnarch s390x
%patch -P 600 -p1
%endif
%patch -P 1222040 -p1
%patch -P 1222041 -p1
%patch -P 1222042 -p1

View File

@ -0,0 +1,37 @@
From 3b78dcec058e85321f636f353ad5c23c986e3a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Mon, 27 Jan 2025 15:24:21 -0500
Subject: [PATCH] radeonsi: disallow compute queues on Raven/Raven2 due to
hangs
Fixes: 58b512ddd6e - radeonsi: execute clears at resource allocation using compute instead of gfx
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12310
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33248>
---
src/gallium/drivers/radeonsi/si_pipe.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 52ac2fc3ead..38b45e5d356 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -517,7 +517,13 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign
return NULL;
}
- sctx->has_graphics = sscreen->info.gfx_level == GFX6 || !(flags & PIPE_CONTEXT_COMPUTE_ONLY);
+ sctx->has_graphics = sscreen->info.gfx_level == GFX6 ||
+ /* Compute queues hang on Raven and derivatives, see:
+ * https://gitlab.freedesktop.org/mesa/mesa/-/issues/12310 */
+ ((sscreen->info.family == CHIP_RAVEN ||
+ sscreen->info.family == CHIP_RAVEN2) &&
+ !sscreen->info.has_dedicated_vram) ||
+ !(flags & PIPE_CONTEXT_COMPUTE_ONLY);
if (flags & PIPE_CONTEXT_DEBUG)
sscreen->record_llvm_ir = true; /* racy but not critical */
--
2.43.0