AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: remove all SI_COHERENCY_* flags except SI_COHERENCY_SHADER

Browse Source 
it will be simplified in the next commit

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31168>
This commit is contained in:
Marek Olšák
2024-08-19 20:58:39 -04:00
parent eb52b774e1
commit a009aa7365
4 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeonsi/si_compute_blit.c
-7
View File
@@ -17,16 +17,9 @@ unsigned si_get_flush_flags(struct si_context *sctx, enum si_coherency coher,
{
switch (coher) {
default:
case SI_COHERENCY_NONE:
case SI_COHERENCY_CP:
return 0;
case SI_COHERENCY_SHADER:
return SI_CONTEXT_INV_SCACHE | SI_CONTEXT_INV_VCACHE |
(cache_policy == L2_BYPASS ? SI_CONTEXT_INV_L2 : 0);
case SI_COHERENCY_CB_META:
return SI_CONTEXT_FLUSH_AND_INV_CB;
case SI_COHERENCY_DB_META:
return SI_CONTEXT_FLUSH_AND_INV_DB;
}
}
src/gallium/drivers/radeonsi/si_cp_dma.c
+1 -4
View File
@@ -23,10 +23,7 @@
static enum si_cache_policy get_cache_policy(struct si_context *sctx, enum si_coherency coher)
{
if ((sctx->gfx_level >= GFX9 && (coher == SI_COHERENCY_CB_META ||
coher == SI_COHERENCY_DB_META ||
coher == SI_COHERENCY_CP)) ||
(sctx->gfx_level >= GFX7 && coher == SI_COHERENCY_SHADER))
if (sctx->gfx_level >= GFX7 && coher == SI_COHERENCY_SHADER)
return L2_LRU;
return L2_BYPASS;
src/gallium/drivers/radeonsi/si_pipe.c
+1 -2
View File
@@ -1088,8 +1088,7 @@ static void si_test_vmfault(struct si_screen *sscreen, uint64_t test_flags)
si_resource(buf)->gpu_address = 0; /* cause a VM fault */
if (test_flags & DBG(TEST_VMFAULT_CP)) {
si_cp_dma_copy_buffer(sctx, buf, buf, 0, 4, 4, SI_OP_SYNC_BEFORE_AFTER,
SI_COHERENCY_NONE);
si_cp_dma_copy_buffer(sctx, buf, buf, 0, 4, 4, SI_OP_SYNC_BEFORE_AFTER, SI_COHERENCY_SHADER);
ctx->flush(ctx, NULL, 0);
puts("VM fault test: CP - done.");
}
src/gallium/drivers/radeonsi/si_pipe.h
-4
View File
@@ -272,11 +272,7 @@ enum si_cache_policy
enum si_coherency
{
SI_COHERENCY_NONE, /* no cache flushes needed */
SI_COHERENCY_SHADER,
SI_COHERENCY_CB_META,
SI_COHERENCY_DB_META,
SI_COHERENCY_CP,
};
#define SI_BIND_CONSTANT_BUFFER_SHIFT 0