diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
index b7e52bc..d905374 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
@@ -204,6 +204,10 @@ intelTexSubImage(struct gl_context * ctx,
 
    bool tex_busy = mt && drm_intel_bo_busy(mt->bo);
 
+   /* HACK, spin until not busy */
+   while (tex_busy)
+      tex_busy = mt && drm_intel_bo_busy(mt->bo);
+
    if (mt && mt->format == MESA_FORMAT_S_UINT8)
       mt->r8stencil_needs_update = true;