diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index f88bf29..fcf1997 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -4685,7 +4685,6 @@ si_write_harvested_raster_configs(struct si_context *sctx,
 			}
 		}
 
-		if (rb_per_se >= 2) {
 			unsigned rb0_mask = 1 << (se * rb_per_se);
 			unsigned rb1_mask = rb0_mask << 1;
 
@@ -4720,7 +4719,6 @@ si_write_harvested_raster_configs(struct si_context *sctx,
 					}
 				}
 			}
-		}
 
 		si_set_grbm_gfx_index_se(sctx, pm4, se);
 		si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, raster_config_se);
@@ -4830,18 +4828,7 @@ static void si_set_raster_config(struct si_context *sctx, struct si_pm4_state *p
 		raster_config_1 = 0x00000000;
 	}
 
-	if (!rb_mask || util_bitcount(rb_mask) >= num_rb) {
-		/* Always use the default config when all backends are enabled
-		 * (or when we failed to determine the enabled backends).
-		 */
-		si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG,
-			       raster_config);
-		if (sctx->b.chip_class >= CIK)
-			si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1,
-				       raster_config_1);
-	} else {
-		si_write_harvested_raster_configs(sctx, pm4, raster_config, raster_config_1);
-	}
+	si_write_harvested_raster_configs(sctx, pm4, raster_config, raster_config_1);
 }
 
 static void si_init_config(struct si_context *sctx)