fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-19 08:00:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv,radeonsi: fix emitting UPDATE_DB_SUMMARIZER_TIMEOUT on GFX12

Browse source 
Not all PFP firmwares for GFX12 have this packet.

Fixes: 47f5d25f93 ("radv,radeonsi: emit UPDATE_DB_SUMMARIZER_TIMEOUT on GFX12")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13312
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35370>
(cherry picked from commit babeb975c4)
This commit is contained in:
Samuel Pitoiset 2025-06-05 17:17:32 +02:00 • committed by Eric Engestrom
parent a3c110e9d6
commit e3637cdb69
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -844,7 +844,7 @@
"description": "radv,radeonsi: fix emitting UPDATE_DB_SUMMARIZER_TIMEOUT on GFX12",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "47f5d25f93fd36224c112ee2d48e511ae078f8c2",
"notes": null

2
src/amd/vulkan/radv_queue.c
View file

@ -700,7 +700,7 @@ radv_emit_ge_rings(struct radv_device *device, struct radeon_cmdbuf *cs, struct
S_0309AC_PAB_TEMPORAL(gfx12_load_last_use_discard) | S_0309AC_SPEC_DATA_READ(gfx12_spec_read_auto) |
S_0309AC_FORCE_SE_SCOPE(1) | S_0309AC_PAB_NOFILL(1)); /* R_0309AC_GE_PRIM_RING_SIZE */
if (pdev->info.gfx_level == GFX12) {
if (pdev->info.gfx_level == GFX12 && pdev->info.pfp_fw_version >= 2680) {
/* Mitigate the HiZ GPU hang by increasing a timeout when BOTTOM_OF_PIPE_TS is used as the
* workaround. This must be emitted when the gfx queue is idle.
*/

2
src/gallium/drivers/radeonsi/si_state_shaders.cpp
View file

@ -5161,7 +5161,7 @@ static void si_emit_spi_ge_ring_state(struct si_context *sctx, unsigned index)
S_0309AC_FORCE_SE_SCOPE(1) |
S_0309AC_PAB_NOFILL(1)); /* R_0309AC_GE_PRIM_RING_SIZE */
if (sctx->gfx_level == GFX12) {
if (sctx->gfx_level == GFX12 && sscreen->info.pfp_fw_version >= 2680) {
/* Mitigate the HiZ GPU hang by increasing a timeout when
* BOTTOM_OF_PIPE_TS is used as the workaround. This must be
* emitted when the gfx queue is idle.