fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: deduplicate how GLM flush flags are set for gfx10-11

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31193>
This commit is contained in:
Marek Olšák 2024-08-25 15:46:36 -04:00 • committed by Marge Bot
parent 3794496994
commit 0e1b7aa8cb
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/radeonsi/si_barrier.c
View file

@ -84,6 +84,7 @@ static void gfx10_emit_barrier(struct si_context *ctx, struct radeon_cmdbuf *cs)
/* We don't need these. */
assert(!(flags & SI_BARRIER_EVENT_FLUSH_AND_INV_DB_META));
assert(ctx->gfx_level < GFX12 || !(flags & SI_BARRIER_INV_L2_METADATA));
radeon_begin(cs);
@ -109,17 +110,17 @@ static void gfx10_emit_barrier(struct si_context *ctx, struct radeon_cmdbuf *cs)
*/
if (flags & SI_BARRIER_INV_L2) {
/* Writeback and invalidate everything in L2. */
gcr_cntl |= S_586_GL2_INV(1) | S_586_GL2_WB(1) |
(ctx->gfx_level < GFX12 ? S_586_GLM_INV(1) | S_586_GLM_WB(1) : 0);
gcr_cntl |= S_586_GL2_INV(1) | S_586_GL2_WB(1);
ctx->num_L2_invalidates++;
} else if (flags & SI_BARRIER_WB_L2) {
gcr_cntl |= S_586_GL2_WB(1) |
(ctx->gfx_level < GFX12 ? S_586_GLM_WB(1) | S_586_GLM_INV(1) : 0);
} else if (flags & SI_BARRIER_INV_L2_METADATA) {
assert(ctx->gfx_level < GFX12);
gcr_cntl |= S_586_GLM_INV(1) | S_586_GLM_WB(1);
gcr_cntl |= S_586_GL2_WB(1);
}
/* Invalidate the metadata cache. */
if (ctx->gfx_level < GFX12 &&
flags & (SI_BARRIER_INV_L2 | SI_BARRIER_WB_L2 | SI_BARRIER_INV_L2_METADATA))
gcr_cntl |= S_586_GLM_INV(1) | S_586_GLM_WB(1);
if (flags & (SI_BARRIER_SYNC_AND_INV_CB | SI_BARRIER_SYNC_AND_INV_DB)) {
if ((flags & SI_BARRIER_SYNC_AND_INV_CB && flags & SI_BARRIER_SYNC_AND_INV_DB) ||
/* Gfx11 can't use the DB_META event and must use a full flush to flush DB_META. */