diff --git a/docs/drivers/llvmpipe.rst b/docs/drivers/llvmpipe.rst
index cc1e1aa2321..404a9efb2e5 100644
--- a/docs/drivers/llvmpipe.rst
+++ b/docs/drivers/llvmpipe.rst
@@ -8,7 +8,7 @@ The Gallium llvmpipe driver is a software rasterizer that uses LLVM to
 do runtime code generation. Shaders, point/line/triangle rasterization
 and vertex processing are implemented with LLVM IR which is translated
 to x86, x86-64, or ppc64le machine code. Also, the driver is
-multithreaded to take advantage of multiple CPU cores (up to 8 at this
+multithreaded to take advantage of multiple CPU cores (up to 32 at this
 time). It's the fastest software rasterizer for Mesa.
 
 Requirements
diff --git a/src/gallium/drivers/llvmpipe/lp_limits.h b/src/gallium/drivers/llvmpipe/lp_limits.h
index 2c90a4fff1e..13fe9e11812 100644
--- a/src/gallium/drivers/llvmpipe/lp_limits.h
+++ b/src/gallium/drivers/llvmpipe/lp_limits.h
@@ -66,7 +66,7 @@
 
 #define LP_MAX_SAMPLES 4
 
-#define LP_MAX_THREADS 16
+#define LP_MAX_THREADS 32
 
 
 /**