diff --git a/src/gallium/drivers/crocus/crocus_state.c b/src/gallium/drivers/crocus/crocus_state.c
index f575fdb8157..eabb39f91ea 100644
--- a/src/gallium/drivers/crocus/crocus_state.c
+++ b/src/gallium/drivers/crocus/crocus_state.c
@@ -5540,11 +5540,11 @@ crocus_update_surface_base_address(struct crocus_batch *batch)
        */
       sba.GeneralStateMOCS            = mocs;
       sba.StatelessDataPortAccessMOCS = mocs;
-#if GFX_VER == 8
       sba.DynamicStateMOCS            = mocs;
       sba.IndirectObjectMOCS          = mocs;
       sba.InstructionMOCS             = mocs;
       sba.SurfaceStateMOCS            = mocs;
+#if GFX_VER == 8
       sba.GeneralStateBufferSize   = 0xfffff;
       sba.IndirectObjectBufferSize = 0xfffff;
       sba.InstructionBufferSize    = 0xfffff;