diff --git a/src/gallium/drivers/llvmpipe/lp_cs_tpool.c b/src/gallium/drivers/llvmpipe/lp_cs_tpool.c
index dd28dbafcbd..50d42126659 100644
--- a/src/gallium/drivers/llvmpipe/lp_cs_tpool.c
+++ b/src/gallium/drivers/llvmpipe/lp_cs_tpool.c
@@ -43,6 +43,7 @@ lp_cs_tpool_worker(void *data)
 
    while (!pool->shutdown) {
       struct lp_cs_tpool_task *task;
+      unsigned iter_per_thread;
 
       while (list_is_empty(&pool->workqueue) && !pool->shutdown)
          cnd_wait(&pool->new_work, &pool->m);
@@ -52,15 +53,26 @@ lp_cs_tpool_worker(void *data)
 
       task = list_first_entry(&pool->workqueue, struct lp_cs_tpool_task,
                               list);
-      unsigned this_iter = task->iter_start++;
+
+      unsigned this_iter = task->iter_start;
+
+      iter_per_thread = task->iter_per_thread;
+
+      if (task->iter_remainder &&
+          task->iter_start + task->iter_remainder == task->iter_total)
+         iter_per_thread = task->iter_remainder;
+
+      task->iter_start += iter_per_thread;
 
       if (task->iter_start == task->iter_total)
          list_del(&task->list);
 
       mtx_unlock(&pool->m);
-      task->work(task->data, this_iter, &lmem);
+      for (unsigned i = 0; i < iter_per_thread; i++)
+         task->work(task->data, this_iter + i, &lmem);
+
       mtx_lock(&pool->m);
-      task->iter_finished++;
+      task->iter_finished += iter_per_thread;
       if (task->iter_finished == task->iter_total)
          cnd_broadcast(&task->finish);
    }
@@ -132,6 +144,10 @@ lp_cs_tpool_queue_task(struct lp_cs_tpool *pool,
    task->work = work;
    task->data = data;
    task->iter_total = num_iters;
+
+   task->iter_per_thread = num_iters / pool->num_threads;
+   task->iter_remainder = num_iters % pool->num_threads;
+
    cnd_init(&task->finish);
 
    mtx_lock(&pool->m);
diff --git a/src/gallium/drivers/llvmpipe/lp_cs_tpool.h b/src/gallium/drivers/llvmpipe/lp_cs_tpool.h
index d32a5e09099..22c0d10e7d4 100644
--- a/src/gallium/drivers/llvmpipe/lp_cs_tpool.h
+++ b/src/gallium/drivers/llvmpipe/lp_cs_tpool.h
@@ -66,6 +66,8 @@ struct lp_cs_tpool_task {
    unsigned iter_total;
    unsigned iter_start;
    unsigned iter_finished;
+   unsigned iter_per_thread;
+   unsigned iter_remainder;
 };
 
 struct lp_cs_tpool *lp_cs_tpool_create(unsigned num_threads);