Module: Mesa Branch: staging/23.3 Commit: 12ab5dfd520e92fb5eba343973e0fb1e4ca618ee URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=12ab5dfd520e92fb5eba343973e0fb1e4ca618ee
Author: Marek Olšák <[email protected]> Date: Sun Nov 5 11:42:33 2023 -0500 radeonsi/gfx11: don't set OREO_MODE to fix rare corruption This is recommended by hw people. Fixes: 19a59f05a47 - radeonsi/gfx11: program db render control register Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25941> (cherry picked from commit 3f108e7615213051466af4ed688e94ce6ddde065) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_state.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index b8443fb1346..2ebb7bc1b12 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -394,7 +394,7 @@ "description": "radeonsi/gfx11: don't set OREO_MODE to fix rare corruption", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "19a59f05a47901a237b506154f2cfedfab9066bc", "notes": null diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index d7dfbff4d3d..b33626fb690 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1570,8 +1570,7 @@ static void si_emit_db_render_state(struct si_context *sctx, unsigned index) max_allowed_tiles_in_wave = 15; } - db_render_control |= S_028000_OREO_MODE(V_028000_OMODE_O_THEN_B) | - S_028000_MAX_ALLOWED_TILES_IN_WAVE(max_allowed_tiles_in_wave); + db_render_control |= S_028000_MAX_ALLOWED_TILES_IN_WAVE(max_allowed_tiles_in_wave); } /* DB_COUNT_CONTROL (occlusion queries) */
