pool/Mesa
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1195891 from X11:XOrg

Browse Source 
- Fix random GPU crash with AMDGPU (bsc#1229050):
  U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch
  (credits go to Takashi Iwai!)

OBS-URL: https://build.opensuse.org/request/show/1195891
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=518
This commit is contained in:
Ana Guerrero 2024-08-26 20:05:35 +00:00 committed by Git OBS Bridge
commit e2f98b9f0c
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mesa.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Aug 25 09:04:57 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- Fix random GPU crash with AMDGPU (bsc#1229050):
U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch
(credits go to Takashi Iwai!)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 21 16:53:28 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de> Wed Aug 21 16:53:28 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>

4
Mesa.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package Mesa # spec file
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
@ -183,6 +183,7 @@ Patch15: u_fix_rust_bindgen.patch
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch Patch58: u_dep_xcb.patch
Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
Patch101: U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch
Patch400: n_stop-iris-flicker.patch Patch400: n_stop-iris-flicker.patch
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
BuildRequires: DirectX-Headers BuildRequires: DirectX-Headers
@ -838,6 +839,7 @@ cp %{SOURCE6} subprojects/packagecache/
%endif %endif
%patch -P 58 -p1 %patch -P 58 -p1
%patch -P 100 -p1 %patch -P 100 -p1
%patch -P 101 -p1
%patch -P 400 -p1 %patch -P 400 -p1
# Remove requires to vulkan libs from baselibs.conf on platforms # Remove requires to vulkan libs from baselibs.conf on platforms

31
U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch Normal file
View File

@ -0,0 +1,31 @@
From 8b35da91b23afc65256b78a59d116fd09544cd28 Mon Sep 17 00:00:00 2001
From: David Rosca <david.rosca@amd.com>
Date: Mon, 5 Aug 2024 09:14:37 +0200
Subject: [PATCH] radeonsi/vcn: Add decode DPB buffers as CS dependency
This is needed to ensure correct synchronization in kernel eg. when it
moves the buffers between VRAM and GTT.
Reviewed-by: Boyuan Zhang <Boyuan.Zhang@amd.com>
(cherry picked from commit 0c024bbe641b092bbbc751baae54a37642794de0)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30537>
---
src/gallium/drivers/radeonsi/radeon_vcn_dec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
index ede5f9d7c1a5..9e3d0b88493b 100644
--- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
+++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
@@ -1838,6 +1838,7 @@ static unsigned rvcn_dec_dynamic_dpb_t2_message(struct radeon_decoder *dec, rvcn
RVID_ERR("Ref list from application is incorrect, using dummy buffer instead.\n");
addr = dec->ws->buffer_get_virtual_address(dummy->dpb.res->buf);
}
+ dec->ws->cs_add_buffer(&dec->cs, d->dpb.res->buf, RADEON_USAGE_READWRITE | RADEON_USAGE_SYNCHRONIZED, RADEON_DOMAIN_VRAM);
dynamic_dpb_t2->dpbAddrLo[i] = addr;
dynamic_dpb_t2->dpbAddrHi[i] = addr >> 32;
++dynamic_dpb_t2->dpbArraySize;
--
2.43.0