diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
index f078ca13050..0d009d800c8 100644
--- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
@@ -57,6 +57,9 @@
  */
 
 
+/**
+ * Describes the location of each texture image within a texture region.
+ */
 struct intel_mipmap_offset {
    GLuint offset; 
    GLuint width;
@@ -74,7 +77,7 @@ struct intel_mipmap_tree {
    GLuint first_level;
    GLuint last_level;
 
-   GLuint width0, height0, depth0;
+   GLuint width0, height0, depth0; /**< Level zero image dimensions */
    GLuint cpp;
    GLboolean compressed;
 
diff --git a/src/mesa/drivers/dri/i915/intel_pixel.c b/src/mesa/drivers/dri/i915/intel_pixel.c
index 2c7ad23b747..83c65951b92 100644
--- a/src/mesa/drivers/dri/i915/intel_pixel.c
+++ b/src/mesa/drivers/dri/i915/intel_pixel.c
@@ -43,7 +43,7 @@ GLboolean intel_check_blit_fragment_ops( GLcontext *ctx )
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
-   /* Scissor could be done with the blitter:
+   /* XXX Note: Scissor could be done with the blitter:
     */
    return !(ctx->_ImageTransferState ||
 	    ctx->Color.AlphaEnabled || 
diff --git a/src/mesa/drivers/dri/i915/intel_regions.c b/src/mesa/drivers/dri/i915/intel_regions.c
index b34954f08e4..f2932fd0047 100644
--- a/src/mesa/drivers/dri/i915/intel_regions.c
+++ b/src/mesa/drivers/dri/i915/intel_regions.c
@@ -145,7 +145,9 @@ struct intel_region *intel_region_create_static( struct intel_context *intel,
 
 
 
-
+/*
+ * XXX Move this into core Mesa?
+ */
 static void _mesa_copy_rect( GLubyte *dst,
 			     GLuint cpp,
 			     GLuint dst_pitch,
diff --git a/src/mesa/drivers/dri/i915/intel_span.c b/src/mesa/drivers/dri/i915/intel_span.c
index 6cba4128601..cd4b30d2178 100644
--- a/src/mesa/drivers/dri/i915/intel_span.c
+++ b/src/mesa/drivers/dri/i915/intel_span.c
@@ -185,6 +185,7 @@ intel_map_unmap_buffers(struct intel_context *intel, GLboolean map)
       for (j = 0; j < ctx->DrawBuffer->_NumColorDrawBuffers[i]; j++) {
          struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[i][j];
          irb = intel_renderbuffer(rb);
+         /* XXX FBO: check irb != NULL to catch software RBs??? */
          ASSERT(irb);
          if (irb->Base.Name != 0) { /* XXX FBO temporary test */
             if (irb->region) {