From 93a4a2ec1b744ecbe3ad4526526ca2986a87d03c Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 1 Apr 2025 08:31:23 +0200 Subject: [PATCH] Revert "radeonsi/gfx11: program SAMPLE_MASK_TRACKER_WATERMARK optimally for APUs" This reverts commit 6ce3a958523dd0be97d9fb9e29af9336440b1213. This likely also causes random GPU hangs. Signed-off-by: Samuel Pitoiset Part-of: (cherry picked from commit 5784a36fd1efeeb880014151270a8d787859c276) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index b9f7201aeec..e00723e54f0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -54,7 +54,7 @@ "description": "Revert \"radeonsi/gfx11: program SAMPLE_MASK_TRACKER_WATERMARK optimally for APUs\"", "nominated": true, "nomination_type": 3, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6ce3a958523dd0be97d9fb9e29af9336440b1213", "notes": null diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 08d9136729f..6a02aa3033a 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -78,9 +78,8 @@ static void si_emit_cb_render_state(struct si_context *sctx, unsigned index) blend->dcc_msaa_corruption_4bit & cb_target_mask && sctx->framebuffer.nr_samples >= 2; if (sctx->gfx_level >= GFX11) { - cb_dcc_control = - S_028424_SAMPLE_MASK_TRACKER_DISABLE(oc_disable) | - S_028424_SAMPLE_MASK_TRACKER_WATERMARK(sctx->screen->info.has_dedicated_vram ? 0 : 15); + cb_dcc_control = S_028424_SAMPLE_MASK_TRACKER_DISABLE(oc_disable) | + S_028424_SAMPLE_MASK_TRACKER_WATERMARK(0); } else { cb_dcc_control = S_028424_OVERWRITE_COMBINER_MRT_SHARING_DISABLE(sctx->gfx_level <= GFX9) |