diff --git a/src/gallium/drivers/etnaviv/etnaviv_emit.h b/src/gallium/drivers/etnaviv/etnaviv_emit.h
index 9061c0f75d7..896f452b041 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_emit.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_emit.h
@@ -73,20 +73,28 @@ etna_set_state_reloc(struct etna_cmd_stream *stream, uint32_t address,
 
 static inline void
 etna_set_state_multi(struct etna_cmd_stream *stream, uint32_t base,
-                     uint32_t num, const uint32_t *values)
+                     int num, const uint32_t *values)
 {
    if (num == 0)
       return;
 
-   etna_cmd_stream_reserve(stream, 1 + num + 1); /* 1 extra for potential alignment */
-   etna_emit_load_state(stream, base >> 2, num, 0);
+   /* A single LOAD_STATE can update at most 1023 states due to the count being
+    * 10 bits wide in HW. Split larger updates into batches. Reserve one header
+    * word per batch, num words of data and one word for potential alignment */
+   etna_cmd_stream_reserve(stream, DIV_ROUND_UP(num, 1023) + num + 1);
 
-   for (uint32_t i = 0; i < num; i++)
-      etna_cmd_stream_emit(stream, values[i]);
+   for (; num > 0; num -= 1023, base += 4092, values += 1023) {
+      int batch_words = MIN2(num, 1023);
 
-   /* add potential padding */
-   if ((num % 2) == 0)
-      etna_cmd_stream_emit(stream, 0);
+      etna_emit_load_state(stream, base >> 2, batch_words, 0);
+
+      for (uint32_t i = 0; i < batch_words; i++)
+         etna_cmd_stream_emit(stream, values[i]);
+
+      /* add potential padding */
+      if ((batch_words % 2) == 0)
+         etna_cmd_stream_emit(stream, 0);
+   }
 }
 
 void