From 88fd0585216b3624c98377e56e13704ab8af43a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 23 Jan 2023 23:08:36 -0500 Subject: [PATCH] radeonsi/gfx11: unset SAMPLE_MASK_TRACKER_WATERMARK to fix hangs Same as PAL. Fixes: 529eb739fc4 - radeonsi/gfx11: add CB deltas Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: (cherry picked from commit 66d11391f76c0892388d933282fbc74028d9edc4) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8f2487d..7316836 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2938,7 +2938,7 @@ "description": "radeonsi/gfx11: unset SAMPLE_MASK_TRACKER_WATERMARK to fix hangs", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "529eb739fc40a5fe2d0d4d4704d29a6f90c97516" }, diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 548279d..6bfb746 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -114,7 +114,7 @@ static void si_emit_cb_render_state(struct si_context *sctx) if (sctx->gfx_level >= GFX11) { radeon_opt_set_context_reg(sctx, R_028424_CB_FDCC_CONTROL, SI_TRACKED_CB_DCC_CONTROL, S_028424_SAMPLE_MASK_TRACKER_DISABLE(oc_disable) | - S_028424_SAMPLE_MASK_TRACKER_WATERMARK(15)); + S_028424_SAMPLE_MASK_TRACKER_WATERMARK(0)); } else { radeon_opt_set_context_reg( sctx, R_028424_CB_DCC_CONTROL, SI_TRACKED_CB_DCC_CONTROL, -- 2.7.4