diff --git a/src/mesa/drivers/dri/i915/intel_bufmgr.c b/src/mesa/drivers/dri/i915/intel_bufmgr.c
index c9efed9f431..3997245f685 100644
--- a/src/mesa/drivers/dri/i915/intel_bufmgr.c
+++ b/src/mesa/drivers/dri/i915/intel_bufmgr.c
@@ -307,6 +307,9 @@ bmMapBuffer(struct bufmgr *bm, unsigned buffer, unsigned flags)
 
       assert(buf);
       /* assert(!buf->mapped); */
+
+      drmBufWaitBusy(bm->driFd, buf);
+
       retval = drmMMMapBuffer(bm->driFd, buf);
    }
    UNLOCK(bm);