diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c
index 56f73d133e4..b4308c04bce 100644
--- a/src/gallium/drivers/radeonsi/si_get.c
+++ b/src/gallium/drivers/radeonsi/si_get.c
@@ -1097,7 +1097,6 @@ void si_init_screen_caps(struct si_screen *sscreen)
    caps->shader_pack_half_float = true;
    caps->framebuffer_no_attachment = true;
    caps->robust_buffer_access_behavior = true;
-   caps->polygon_offset_units_unscaled = true;
    caps->string_marker = true;
    caps->cull_distance = true;
    caps->shader_array_components = true;
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 9fc9d9948bd..f203934ddac 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1121,24 +1121,18 @@ static void *si_create_rs_state(struct pipe_context *ctx, const struct pipe_rast
       rs->pa_su_poly_offset_clamp = fui(state->offset_clamp);
       rs->pa_su_poly_offset_frontback_scale = fui(state->offset_scale * 16);
 
-      if (!state->offset_units_unscaled) {
-         /* 16-bit zbuffer */
-         rs->pa_su_poly_offset_db_fmt_cntl[0] = S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS(-16);
-         rs->pa_su_poly_offset_frontback_offset[0] = fui(state->offset_units * 4);
+      /* 16-bit zbuffer */
+      rs->pa_su_poly_offset_db_fmt_cntl[0] = S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS(-16);
+      rs->pa_su_poly_offset_frontback_offset[0] = fui(state->offset_units * 4);
 
-         /* 24-bit zbuffer */
-         rs->pa_su_poly_offset_db_fmt_cntl[1] = S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS(-24);
-         rs->pa_su_poly_offset_frontback_offset[1] = fui(state->offset_units * 2);
+      /* 24-bit zbuffer */
+      rs->pa_su_poly_offset_db_fmt_cntl[1] = S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS(-24);
+      rs->pa_su_poly_offset_frontback_offset[1] = fui(state->offset_units * 2);
 
-         /* 32-bit zbuffer */
-         rs->pa_su_poly_offset_db_fmt_cntl[2] = S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS(-23) |
-                                                S_028B78_POLY_OFFSET_DB_IS_FLOAT_FMT(1);
-         rs->pa_su_poly_offset_frontback_offset[2] = fui(state->offset_units);
-      } else {
-         rs->pa_su_poly_offset_frontback_offset[0] = fui(state->offset_units);
-         rs->pa_su_poly_offset_frontback_offset[1] = fui(state->offset_units);
-         rs->pa_su_poly_offset_frontback_offset[2] = fui(state->offset_units);
-      }
+      /* 32-bit zbuffer */
+      rs->pa_su_poly_offset_db_fmt_cntl[2] = S_028B78_POLY_OFFSET_NEG_NUM_DB_BITS(-23) |
+                                             S_028B78_POLY_OFFSET_DB_IS_FLOAT_FMT(1);
+      rs->pa_su_poly_offset_frontback_offset[2] = fui(state->offset_units);
    }
 
    return rs;