diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 157a1982d37..90e05a590f3 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -1185,9 +1185,11 @@ radeonsi_screen_create_impl(struct radeon_winsys *ws,
 	sscreen->has_out_of_order_rast = sscreen->info.has_out_of_order_rast &&
 					 !(sscreen->debug_flags & DBG(NO_OUT_OF_ORDER));
 	sscreen->assume_no_z_fights =
-		driQueryOptionb(config->options, "radeonsi_assume_no_z_fights");
+		driQueryOptionb(config->options, "radeonsi_assume_no_z_fights") ||
+		driQueryOptionb(config->options, "allow_draw_out_of_order");
 	sscreen->commutative_blend_add =
-		driQueryOptionb(config->options, "radeonsi_commutative_blend_add");
+		driQueryOptionb(config->options, "radeonsi_commutative_blend_add") ||
+		driQueryOptionb(config->options, "allow_draw_out_of_order");
 
 	sscreen->use_ngg = sscreen->info.chip_class >= GFX10 &&
 			   sscreen->info.family != CHIP_NAVI14 &&