fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "radeonsi/gfx11: program SAMPLE_MASK_TRACKER_WATERMARK optimally for APUs"

Browse source 
This reverts commit 6ce3a95852.

This likely also causes random GPU hangs.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34306>
(cherry picked from commit 5784a36fd1)
This commit is contained in:
Samuel Pitoiset 2025-04-01 08:31:23 +02:00 • committed by Eric Engestrom
parent ccc86bd62e
commit 93a4a2ec1b
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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

5
src/gallium/drivers/radeonsi/si_state.c
View file

@ -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) |