diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 3f84725f8f2..2e3232d1cf0 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -489,6 +489,11 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
 
 	if (sscreen->info.num_rings[RING_DMA] &&
 	    !(sscreen->debug_flags & DBG(NO_SDMA)) &&
+	    /* SDMA causes corruption on RX 580:
+	     *    https://gitlab.freedesktop.org/mesa/mesa/issues/1399
+	     *    https://gitlab.freedesktop.org/mesa/mesa/issues/1889
+	     */
+	    (sctx->chip_class != GFX8 || sscreen->debug_flags & DBG(FORCE_SDMA)) &&
 	    /* SDMA timeouts sometimes on gfx10 so disable it for now. See:
 	     *    https://bugs.freedesktop.org/show_bug.cgi?id=111481
 	     *    https://gitlab.freedesktop.org/mesa/mesa/issues/1907