diff --git a/src/gallium/drivers/llvmpipe/lp_bld_blend.c b/src/gallium/drivers/llvmpipe/lp_bld_blend.c
index 02ec55eddbd..e68e6d4a13c 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_blend.c
+++ b/src/gallium/drivers/llvmpipe/lp_bld_blend.c
@@ -168,7 +168,7 @@ lp_build_blend_func(struct lp_build_context *bld,
 
 
 /**
- * Performs optimisations and blending independent of SoA/AoS
+ * Performs optimizations and blending independent of SoA/AoS
  *
  * @param func                   the blend function
  * @param factor_src             PIPE_BLENDFACTOR_xxx
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_point.c b/src/gallium/drivers/llvmpipe/lp_setup_point.c
index a18ecf7ab57..4a7fda5c9a7 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_point.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_point.c
@@ -81,7 +81,7 @@ point_persp_coeff(struct lp_setup_context *setup,
 {
    /*
     * Fragment shader expects pre-multiplied w for LP_INTERP_PERSPECTIVE. A
-    * better stratergy would be to take the primitive in consideration when
+    * better strategy would be to take the primitive in consideration when
     * generating the fragment shader key, and therefore avoid the per-fragment
     * perspective divide.
     */
@@ -404,7 +404,7 @@ try_setup_point( struct lp_setup_context *setup,
        * Per OpenGL 2.1 spec, section 3.3.1, "Basic Point Rasterization".
        *
        * This type of point rasterization is only available in pre 3.0 contexts
-       * (or compatibilility contexts which we don't support) anyway.
+       * (or compatibility contexts which we don't support) anyway.
        */
 
       const int x0 = subpixel_snap(v0[0][0]);
diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c
index 2f6ecfa34dd..392dd4bfbb5 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_cs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c
@@ -829,7 +829,7 @@ llvmpipe_update_cs(struct llvmpipe_context *lp)
          }
 
          /*
-          * We need to re-check lp->nr_cs_variants because an arbitrarliy large
+          * We need to re-check lp->nr_cs_variants because an arbitrarily large
           * number of shader variants (potentially all of them) could be
           * pending for destruction on flush.
           */
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index ec77d3cee33..b30f5b661ae 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -2355,7 +2355,7 @@ generate_unswizzled_blend(struct gallivm_state *gallivm,
          continue;
       }
 
-      /* Ensure we havn't already found all channels */
+      /* Ensure we haven't already found all channels */
       if (dst_channels >= out_format_desc->nr_channels) {
          continue;
       }
diff --git a/src/gallium/drivers/llvmpipe/lp_state_rasterizer.c b/src/gallium/drivers/llvmpipe/lp_state_rasterizer.c
index a4ffd68397e..cd907cfb0f4 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_rasterizer.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_rasterizer.c
@@ -70,7 +70,7 @@ llvmpipe_create_rasterizer_state(struct pipe_context *pipe,
    memcpy(&state->draw_state, rast, sizeof *rast);
    memcpy(&state->lp_state, rast, sizeof *rast);
 
-   /* We rely on draw module to do unfilled polyons, AA lines and
+   /* We rely on draw module to do unfilled polygons, AA lines and
     * points and stipple.
     * 
     * Over time, reduce this list of conditions, and expand the list
diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.c b/src/gallium/drivers/llvmpipe/lp_state_setup.c
index a2f70681c00..2bc94d5d4cd 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_setup.c
@@ -481,7 +481,7 @@ apply_perspective_corr( struct gallivm_state *gallivm,
 
 
 /**
- * Applys cylindrical wrapping to vertex attributes if enabled.
+ * Apply cylindrical wrapping to vertex attributes if enabled.
  * Input coordinates must be in [0, 1] range, otherwise results are undefined.
  *
  * @param cyl_wrap  TGSI_CYLINDRICAL_WRAP_x flags
diff --git a/src/gallium/drivers/llvmpipe/lp_test_conv.c b/src/gallium/drivers/llvmpipe/lp_test_conv.c
index 9f928973be9..43e051fbeeb 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_conv.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_conv.c
@@ -175,7 +175,7 @@ test_one(unsigned verbose,
 
    /* Known failures
     * - fixed point 32 -> float 32
-    * - float 32 -> signed normalised integer 32
+    * - float 32 -> signed normalized integer 32
     */
    if ((src_type.floating && !dst_type.floating && dst_type.sign && dst_type.norm && src_type.width == dst_type.width) ||
        (!src_type.floating && dst_type.floating && src_type.fixed && src_type.width == dst_type.width)) {
@@ -184,7 +184,7 @@ test_one(unsigned verbose,
 
    /* Known failures
     * - fixed point 32 -> float 32
-    * - float 32 -> signed normalised integer 32
+    * - float 32 -> signed normalized integer 32
     */
    if ((src_type.floating && !dst_type.floating && dst_type.sign && dst_type.norm && src_type.width == dst_type.width) ||
        (!src_type.floating && dst_type.floating && src_type.fixed && src_type.width == dst_type.width)) {