From 89a2ea6fd316150d4a50113a12e189eaa98cc6df Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Mon, 28 Aug 2006 11:37:07 +0000
Subject: [PATCH] Add missing wait for busy buffers in bmMapBuffer()

---
 src/mesa/drivers/dri/i915/intel_bufmgr.c | 3 +++
 1 file changed, 3 insertions(+)

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);