From d44c3e647fe99a3aa1175fcbd6a2179d7d1f17fb Mon Sep 17 00:00:00 2001
From: Aapo Tahkola <aet@rasterburn.org>
Date: Wed, 26 Apr 2006 11:36:27 +0000
Subject: [PATCH] R300_SPAN_DISABLE_LOCKING env var

---
 src/mesa/drivers/dri/r300/r300_context.h |  1 +
 src/mesa/drivers/dri/r300/radeon_span.c  | 28 ++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 65bf9964df4..7ff805fd5d3 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -830,6 +830,7 @@ struct r300_context {
 #endif
 
 	GLboolean texmicrotile;
+	GLboolean span_dlocking;
 };
 
 struct r300_buffer_object {
diff --git a/src/mesa/drivers/dri/r300/radeon_span.c b/src/mesa/drivers/dri/r300/radeon_span.c
index d77c5a39034..f7c07562171 100644
--- a/src/mesa/drivers/dri/r300/radeon_span.c
+++ b/src/mesa/drivers/dri/r300/radeon_span.c
@@ -252,19 +252,43 @@ do {									\
 static void radeonSpanRenderStart( GLcontext *ctx )
 {
    radeonContextPtr rmesa = RADEON_CONTEXT( ctx );
+   {
+	static int first = 1;
+	r300ContextPtr r300 = rmesa;
+	
+	if (first) {
+		r300->span_dlocking = getenv("R300_SPAN_DISABLE_LOCKING") ? 1 : 0;
+		if (r300->span_dlocking == 0) {
+			fprintf(stderr, "Try R300_SPAN_DISABLE_LOCKING env var if this hangs.\n");
+			fflush(stderr);
+			sleep(1);
+		}
+		first = 0;
+	}
+	
+	if (r300->span_dlocking) {
+		r300Flush(ctx);
+		LOCK_HARDWARE( rmesa );
+		radeonWaitForIdleLocked( rmesa );
+		UNLOCK_HARDWARE( rmesa );
+		
+		return;
+	}
+   }
    //   R300_FIREVERTICES( rmesa );
    // old code has flush
    r300Flush(ctx);
    LOCK_HARDWARE( rmesa );
    radeonWaitForIdleLocked( rmesa );
-   UNLOCK_HARDWARE( rmesa );
 }
 
 static void radeonSpanRenderFinish( GLcontext *ctx )
 {
    radeonContextPtr rmesa = RADEON_CONTEXT( ctx );
+   r300ContextPtr r300 = rmesa;
    _swrast_flush( ctx );
-   //UNLOCK_HARDWARE( rmesa );
+   if (r300->span_dlocking == 0)
+	UNLOCK_HARDWARE( rmesa );
 }
 
 void radeonInitSpanFuncs( GLcontext *ctx )
-- 
2.30.2