From 5319ed0e531b80038cebb4fef85f59bd2c3360a1 Mon Sep 17 00:00:00 2001
From: Aapo Tahkola <aet@rasterburn.org>
Date: Mon, 20 Mar 2006 13:37:28 +0000
Subject: Fix texrect upload conflicts.

---
 src/mesa/drivers/dri/r300/r300_texmem.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/mesa/drivers')

diff --git a/src/mesa/drivers/dri/r300/r300_texmem.c b/src/mesa/drivers/dri/r300/r300_texmem.c
index d78ec3b12c..90d8b2fd8e 100644
--- a/src/mesa/drivers/dri/r300/r300_texmem.c
+++ b/src/mesa/drivers/dri/r300/r300_texmem.c
@@ -56,6 +56,10 @@ SOFTWARE.
 #include "r300_ioctl.h"
 #include <unistd.h>		/* for usleep() */
 
+#ifdef USER_BUFFERS
+#include "radeon_mm.h"
+#endif
+
 /**
  * Destroy any device-dependent state associated with the texture.  This may
  * include NULLing out hardware state that points to the texture.
@@ -268,6 +272,9 @@ static void r300UploadRectSubImage(r300ContextPtr rmesa,
 				     width, lines);
 
 			r300EmitWait(rmesa, R300_WAIT_2D);
+#ifdef USER_BUFFERS
+			radeon_mm_use(rmesa, region.buf->id);
+#endif
 
 			r300ReleaseDmaRegion(rmesa, &region, __FUNCTION__);
 			done += lines;
-- 
cgit v1.2.3