From: Alex Deucher <alexdeucher@gmail.com>
Date: Tue, 30 Jun 2009 22:40:48 +0000 (-0400)
Subject: R6xx/r7xx: fix locking for clear
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d10006e67fb070f846213ef38e07df21699df5a1;p=mesa.git

R6xx/r7xx: fix locking for clear

this allows redbook hello to render correctly mostly.
---

diff --git a/src/mesa/drivers/dri/r600/r700_clear.c b/src/mesa/drivers/dri/r600/r700_clear.c
index b04441da281..76967956761 100644
--- a/src/mesa/drivers/dri/r600/r700_clear.c
+++ b/src/mesa/drivers/dri/r600/r700_clear.c
@@ -32,6 +32,7 @@
 #include "main/mtypes.h"
 #include "main/enums.h"
 
+#include "radeon_lock.h"
 #include "r600_context.h"
 
 #include "r700_shaderinst.h"
@@ -68,14 +69,12 @@ void r700Clear(GLcontext * ctx, GLbitfield mask)
         return;
     }
 
-#if 0
 	if (!context->radeon.radeonScreen->driScreen->dri2.enabled) {
 		LOCK_HARDWARE(&context->radeon);
 		UNLOCK_HARDWARE(&context->radeon);
 		if (dPriv->numClipRects == 0)
 			return;
 	}
-#endif
 
 	R600_NEWPRIM(context);
 
diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c
index b496543e1d8..e46b21c85c1 100644
--- a/src/mesa/drivers/dri/r600/r700_render.c
+++ b/src/mesa/drivers/dri/r600/r700_render.c
@@ -44,7 +44,6 @@
 #include "tnl/t_vertex.h"
 #include "tnl/t_pipeline.h"
 
-#include "radeon_lock.h"
 #include "r600_context.h"
 #include "r600_cmdbuf.h"
 
@@ -296,9 +295,6 @@ static GLboolean r700RunRender(GLcontext * ctx,
     /* flush vtx */
     //r700SyncSurf(context); /*  */
 
-    LOCK_HARDWARE( &context->radeon );
-    UNLOCK_HARDWARE( &context->radeon );
-
     r700SendContextStates(context);
     r700SendViewportState(context, 0);
     r700SendRenderTargetState(context, 0);