diff --git a/src/gallium/drivers/radeonsi/si_compute_blit.c b/src/gallium/drivers/radeonsi/si_compute_blit.c
index 829f31fe943..35b00a30dab 100644
--- a/src/gallium/drivers/radeonsi/si_compute_blit.c
+++ b/src/gallium/drivers/radeonsi/si_compute_blit.c
@@ -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;
    }
 }
 
diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c
index e8cbce39624..2dc2f249bdd 100644
--- a/src/gallium/drivers/radeonsi/si_cp_dma.c
+++ b/src/gallium/drivers/radeonsi/si_cp_dma.c
@@ -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;
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index bb8d397c695..4f6dbbf1b28 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -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.");
    }
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 65f70b99547..5e726d34763 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -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